Bug 1361957 - Update new icons to match Photon spec r?dao draft
authorRicky Chien <ricky060709@gmail.com>
Fri, 21 Jul 2017 17:22:43 +0800
changeset 615615 701bd5cb2666f675dc0f34905c0380c9e4c2b07a
parent 615492 9eddb0a92820c6445f9d1e680e4c239e888e93f0
child 639234 eef9f3b72b4f5e50b8699a2f8ce31477d3c352f1
push id70426
push userbmo:rchien@mozilla.com
push dateWed, 26 Jul 2017 07:09:09 +0000
reviewersdao
bugs1361957
milestone56.0a1
Bug 1361957 - Update new icons to match Photon spec r?dao MozReview-Commit-ID: 9gFXd9kA6zc
browser/components/preferences/in-content-new/main.xul
browser/themes/shared/incontentprefs/face-sad.svg
browser/themes/shared/incontentprefs/face-smile.svg
browser/themes/shared/incontentprefs/fxa-avatar.svg
browser/themes/shared/incontentprefs/fxa-focused.svg
browser/themes/shared/incontentprefs/fxa.svg
browser/themes/shared/incontentprefs/general-focused.svg
browser/themes/shared/incontentprefs/general.svg
browser/themes/shared/incontentprefs/logo-android.svg
browser/themes/shared/incontentprefs/logo-ios.svg
browser/themes/shared/incontentprefs/preferences.inc.css
browser/themes/shared/incontentprefs/privacy-security-focused.svg
browser/themes/shared/incontentprefs/privacy-security.svg
browser/themes/shared/incontentprefs/search-focused.svg
browser/themes/shared/incontentprefs/search.svg
browser/themes/shared/jar.inc.mn
--- a/browser/components/preferences/in-content-new/main.xul
+++ b/browser/components/preferences/in-content-new/main.xul
@@ -304,23 +304,25 @@
 #endif
 
 #ifdef HAVE_SHELL_SERVICE
   <vbox id="defaultBrowserBox">
     <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser"
               label="&alwaysCheckDefault2.label;" accesskey="&alwaysCheckDefault2.accesskey;"/>
     <deck id="setDefaultPane">
       <hbox align="center" class="indent">
+        <image class="face-sad"/>
         <label id="isNotDefaultLabel" flex="1">&isNotDefault.label;</label>
         <button id="setDefaultButton"
                 class="accessory-button"
                 label="&setAsMyDefaultBrowser3.label;" accesskey="&setAsMyDefaultBrowser3.accesskey;"
                 preference="pref.general.disable_button.default_browser"/>
       </hbox>
       <hbox align="center" class="indent">
+        <image class="face-smile"/>
         <label id="isDefaultLabel" flex="1">&isDefault.label;</label>
       </hbox>
     </deck>
     <separator class="thin"/>
   </vbox>
 #endif
 
   <html:table id="startupTable">
@@ -801,30 +803,32 @@
       <hbox id="adminDisabled" align="center">
         <label>&update.adminDisabled;</label>
         <spacer flex="1"/>
         <button label="&update.checkForUpdatesButton.label;"
                 accesskey="&update.checkForUpdatesButton.accesskey;"
                 disabled="true"/>
       </hbox>
       <hbox id="noUpdatesFound" align="center">
+        <image class="face-smile"/>
         <label>&update.noUpdatesFound;</label>
         <spacer flex="1"/>
         <button label="&update.checkForUpdatesButton.label;"
                 accesskey="&update.checkForUpdatesButton.accesskey;"
                 oncommand="gAppUpdater.checkForUpdates();"/>
       </hbox>
       <hbox id="otherInstanceHandlingUpdates" align="center">
         <label>&update.otherInstanceHandlingUpdates;</label>
         <spacer flex="1"/>
         <button label="&update.checkForUpdatesButton.label;"
                 accesskey="&update.checkForUpdatesButton.accesskey;"
                 disabled="true"/>
       </hbox>
       <hbox id="manualUpdate" align="center">
+        <image class="face-sad"/>
         <label>&update.manual.start;</label><label id="manualLink" class="text-link"/><label>&update.manual.end;</label>
         <spacer flex="1"/>
         <button label="&update.checkForUpdatesButton.label;"
                 accesskey="&update.checkForUpdatesButton.accesskey;"
                 disabled="true"/>
       </hbox>
       <hbox id="unsupportedSystem" align="center">
         <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/face-sad.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+  <g fill="none" fill-rule="evenodd" transform="translate(0 .8)">
+    <path fill="#00D3E7" d="M9.94 0a9.01 9.01 0 0 0-9 9.42 1.07 1.07 0 0 0 .13 2.12h.21A9.01 9.01 0 1 0 9.94 0"/>
+    <path fill="#00A1C1" d="M18.93 9.41v-.4c0-2.4-.93-4.6-2.47-6.2A9.26 9.26 0 0 1 3.72 15.54a9 9 0 0 0 14.85-4l.21-.01c.6 0 1.07-.48 1.07-1.07.01-.54-.4-.99-.92-1.06"/>
+    <path fill="#323B59" d="M5.47 5.75a.99.99 0 0 0-.99.99v2.22a.99.99 0 1 0 1.98 0V6.74a.99.99 0 0 0-1-.99m8.98 0a.99.99 0 0 0-1 .99v2.22a.99.99 0 1 0 1.98 0V6.74a.99.99 0 0 0-.98-.99m-4.5 5.47a2.27 2.27 0 0 0-2.34 2.13c-.02.23.09.45.27.58.19.14.43.17.64.09 0 0 .47-.17 1.34-.17.91 0 1.55.19 1.56.19a.69.69 0 0 0 .61-.11.67.67 0 0 0 .26-.58 2.27 2.27 0 0 0-2.34-2.13"/>
+    <path fill="#00A1C1" d="M4.59 6.22c-.36 0-.72-.11-1.03-.32a.31.31 0 1 1 .35-.53 1.25 1.25 0 0 0 1.8-.47.31.31 0 1 1 .56.28 1.88 1.88 0 0 1-1.68 1.04m10.47 0a1.88 1.88 0 0 1-1.68-1.04.31.31 0 1 1 .56-.28 1.24 1.24 0 0 0 1.8.48.32.32 0 0 1 .35.53c-.3.2-.66.3-1.03.3"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/face-smile.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+  <g fill="none" fill-rule="evenodd" transform="translate(0 .8)">
+    <path fill="#FFBF49" d="M9.95 0A9.03 9.03 0 0 0 .92 9.03l.01.4a1.07 1.07 0 0 0 .14 2.13h.21A9.04 9.04 0 1 0 9.95 0"/>
+    <path fill="#323B59" d="M14.44 5.9c.55 0 1 .44 1 .99V9.1c0 .55-.45.12-1 .12s-.99.42-.99-.12V6.89c0-.55.45-1 1-1"/>
+    <path fill="#FFA500" d="M13.54 9.66a.31.31 0 0 1-.14-.59 2.36 2.36 0 0 1 2.08-.03.3.3 0 0 1 .14.41.3.3 0 0 1-.41.15 1.75 1.75 0 0 0-1.53.02.28.28 0 0 1-.14.04"/>
+    <path fill="#323B59" d="M5.46 5.9c.55 0 .99.44.99.99V9.1c0 .55-.44.12-.99.12s-.99.42-.99-.12V6.89c0-.55.45-1 .99-1"/>
+    <path fill="#FFA500" d="M4.56 9.66a.31.31 0 0 1-.14-.59 2.36 2.36 0 0 1 2.07-.03.3.3 0 0 1 .15.41.3.3 0 0 1-.41.15 1.75 1.75 0 0 0-1.53.02.3.3 0 0 1-.14.04"/>
+    <path fill="#323B59" d="M16.06 11.62l-.62-.05c-.06.02-.21.06-.45.1-.3.04-.73.15-1.25.2-.51.04-1.12.14-1.76.17-.65.04-1.33.05-2.03.06-.68-.01-1.37-.02-2.02-.07-.65-.03-1.25-.12-1.76-.17-.52-.04-.95-.15-1.25-.2l-.45-.09a30.35 30.35 0 0 0-.7.07.17.17 0 0 0-.04.23l.1.17a7.67 7.67 0 0 0 1.54 1.75c.5.45 1.01.78 1.53 1.06l.41.19c.78-.55 1.68.2 2.64.2.97 0 1.87-.74 2.64-.2.14-.05.28-.1.42-.18a8.34 8.34 0 0 0 3.06-2.82l.1-.18c.02-.02.03-.04.03-.07a.16.16 0 0 0-.14-.17"/>
+    <path fill="#FFFFFF" d="M6.17 11.86c.51.05 1.12.14 1.76.17.65.05 1.33.06 2.02.07.7-.01 1.38-.02 2.03-.06.65-.04 1.25-.13 1.76-.17.52-.05.95-.15 1.25-.2.24-.04.4-.08.45-.1l-.9-.05-1.53-.06c-1.02-.03-2.04-.03-3.06-.05-1.02.02-2.04.02-3.05.05l-1.53.06-.9.05c.05.02.21.06.45.1.3.04.73.15 1.25.2"/>
+    <path fill="#FFA500" d="M18.96 9.43v-.4c0-2.42-.94-4.6-2.48-6.22A9.27 9.27 0 0 1 3.72 15.57a9.02 9.02 0 0 0 14.87-4l.22-.01c.6 0 1.08-.48 1.08-1.07 0-.55-.4-1-.93-1.06"/>
+    <path fill="#FF7664" d="M12.58 15.05h.01c-.77-.55-1.68-.37-2.64-.25-.96-.12-1.87-.3-2.64.25.87.39 1.73.57 2.6.58H10c.86 0 1.73-.2 2.6-.58h-.02"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/fxa-avatar.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="80" height="80" fill="#E1E1E6" rx="40"/>
+    <g transform="translate(6 9)">
+      <path fill="#F5F5F7" d="M64.5 32.2l.02-1.36A30.5 30.5 0 0 0 33.97.41 30.5 30.5 0 0 0 3.41 30.84l.02 1.36a3.62 3.62 0 0 0-3.15 3.58c0 2 1.62 3.6 3.63 3.6h.72a30.46 30.46 0 0 0 8.3 13.51l-.04-.02a30.54 30.54 0 0 0 19.72 8.35l.24.01.43.01.51.01H34.65l.41-.02h.27c.16-.02.33-.02.5-.03l.12-.01A30.55 30.55 0 0 0 63.3 39.37h.68a3.61 3.61 0 0 0 .51-7.18"/>
+      <path fill="#C8C8CC" d="M52.53 30.81v-7.18a3.35 3.35 0 1 0-6.7 0v7.27l-.17.08a1.05 1.05 0 0 0 .47 1.98c.17 0 .32-.04.47-.12a5.94 5.94 0 0 1 5.18-.07c.53.25 1.15.03 1.4-.5.25-.52.03-1.14-.5-1.39l-.15-.07zm-30.41 0v-7.18a3.35 3.35 0 1 0-6.7 0v7.27l-.17.08a1.05 1.05 0 0 0 .47 1.98 1 1 0 0 0 .47-.12 5.94 5.94 0 0 1 5.18-.07c.53.25 1.15.03 1.4-.5.25-.52.03-1.14-.5-1.39l-.15-.07zM42.85 51.1l.07.04c.47-.2.93-.38 1.4-.62A28.29 28.29 0 0 0 54.68 41l.37-.58a.58.58 0 0 0 .08-.26.53.53 0 0 0-.47-.57c-.7-.07-1.4-.11-2.1-.15-.2.05-.72.18-1.53.33-1.02.14-2.47.5-4.22.66-1.74.15-3.8.47-5.97.57-2.19.15-4.51.18-6.85.2-2.33-.04-4.67-.07-6.86-.22-2.19-.1-4.22-.41-5.97-.56-1.74-.17-3.21-.51-4.22-.66-.8-.16-1.35-.28-1.53-.33-.72.04-1.42.1-2.14.15a.47.47 0 0 0-.25.1.56.56 0 0 0-.13.75l.38.57a30.15 30.15 0 0 0 5.18 5.91 27.28 27.28 0 0 0 5.18 3.57c.47.25.94.43 1.41.64a3.84 3.84 0 0 1-.01.02l.02.02-.02.01a21.8 21.8 0 0 0 8.79 1.93l.14.02h.03l.13-.02a21.8 21.8 0 0 0 8.8-1.93l-.03-.01c.02 0 .02 0 .03-.02a6.87 6.87 0 0 0-.07-.04z"/>
+    </g>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/fxa-focused.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="#0A84FF" fill-rule="evenodd">
+    <path fill-opacity=".5" d="M12 15a8.15 8.15 0 0 0-7.67 5h15.34A8.15 8.15 0 0 0 12 15z"/>
+    <path fill-opacity=".3" d="M8 8a4 4 0 1 0 8 0 4 4 0 0 0-8 0z"/>
+    <path fill-rule="nonzero" d="M9.28 13.35a6 6 0 1 1 5.44 0 9.8 9.8 0 0 1 7.26 7.46A1 1 0 0 1 21 22H3a1 1 0 0 1-.98-1.2 9.8 9.8 0 0 1 7.26-7.45zM12 15a8.15 8.15 0 0 0-7.67 5h15.34A8.15 8.15 0 0 0 12 15zM8 8a4 4 0 1 0 8 0 4 4 0 0 0-8 0z"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/fxa.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="#0C0C0D" fill-rule="evenodd">
+    <path fill-opacity=".5" d="M12 15a8.15 8.15 0 0 0-7.67 5h15.34A8.15 8.15 0 0 0 12 15z"/>
+    <path fill-opacity=".3" d="M8 8a4 4 0 1 0 8 0 4 4 0 0 0-8 0z"/>
+    <path fill-opacity=".8" fill-rule="nonzero" d="M9.28 13.35a6 6 0 1 1 5.44 0 9.8 9.8 0 0 1 7.26 7.46A1 1 0 0 1 21 22H3a1 1 0 0 1-.98-1.2 9.8 9.8 0 0 1 7.26-7.45zM12 15a8.15 8.15 0 0 0-7.67 5h15.34A8.15 8.15 0 0 0 12 15zM8 8a4 4 0 1 0 8 0 4 4 0 0 0-8 0z"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/general-focused.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="#0A84FF" fill-rule="evenodd">
+    <path fill-rule="nonzero" d="M8.24 16.32l.43-.5.55.37a5 5 0 0 0 1.77.74l.6.12v3.04a.4.4 0 1 0 .82 0v-3.04l.6-.12a4.99 4.99 0 0 0 1.76-.74l.51-.34.43.44L17.44 18a.4.4 0 0 0 .28.12c.11 0 .21-.04.3-.12a.4.4 0 0 0 0-.57l-2.17-2.16.34-.51c.36-.54.61-1.14.74-1.76l.12-.6h3.04a.4.4 0 1 0 0-.82h-3.04l-.12-.6a4.99 4.99 0 0 0-.74-1.76l-.34-.51.44-.43L18 6.56a.4.4 0 0 0-.57-.57l-2.16 2.16-.51-.34A4.99 4.99 0 0 0 13 7.07l-.6-.12V3.9a.4.4 0 1 0-.82 0v3.04l-.6.12c-.62.13-1.22.38-1.76.74l-.51.34-.43-.44L6.56 6a.4.4 0 0 0-.57.57l2.16 2.16-.34.51c-.36.54-.61 1.14-.74 1.76l-.12.6H3.9a.4.4 0 1 0 0 .82h3.04l.12.6a5 5 0 0 0 .74 1.77l.37.55-.5.43c-.12.1-.12.1-.16.11.02 0 .08-.04.12-.09L6 17.44a.4.4 0 0 0 .57.57l1.64-1.63c0-.02.02-.03.04-.06zm-.61 2.75a1.9 1.9 0 0 1-2.7 0 1.9 1.9 0 0 1 0-2.7l1.3-1.3a6.5 6.5 0 0 1-.48-1.16H3.91a1.9 1.9 0 1 1 0-3.82h1.84c.13-.4.29-.79.49-1.16l-1.31-1.3a1.9 1.9 0 0 1 2.7-2.7l1.3 1.3c.37-.19.76-.35 1.16-.48V3.91a1.9 1.9 0 1 1 3.82 0v1.84c.4.13.79.29 1.16.49l1.3-1.31a1.9 1.9 0 1 1 2.7 2.7l-1.3 1.3c.19.37.35.76.48 1.16h1.84a1.9 1.9 0 1 1 0 3.82h-1.84c-.13.4-.29.79-.49 1.16l1.31 1.3a1.9 1.9 0 0 1-2.7 2.7l-1.3-1.3c-.37.19-.76.35-1.16.48v1.84a1.9 1.9 0 1 1-3.82 0v-1.84a6.5 6.5 0 0 1-1.16-.49l-1.3 1.3zM9 12a3 3 0 1 1 6 0 3 3 0 0 1-6 0zm1 0a2 2 0 1 0 4 0 2 2 0 0 0-4 0z"/>
+    <path fill-opacity=".5" d="M8.24 16.32l-.04.06L6.56 18a.4.4 0 0 1-.28.12.4.4 0 0 1-.29-.7l1.65-1.65a.53.53 0 0 1-.12.1l.16-.12.5-.43-.37-.55A5 5 0 0 1 7.07 13l-.12-.6H3.9a.4.4 0 1 1 0-.82h3.04l.12-.6c.13-.62.38-1.22.74-1.76l.34-.51-2.16-2.16A.4.4 0 0 1 6.56 6L8.3 7.7l.43.44.51-.34c.54-.36 1.14-.61 1.76-.74l.6-.12V3.9a.4.4 0 1 1 .82 0v3.04l.6.12c.62.13 1.22.38 1.76.74l.51.34 2.16-2.16a.4.4 0 1 1 .57.57L16.29 8.3l-.44.43.34.51c.36.54.61 1.14.74 1.76l.12.6h3.04a.4.4 0 1 1 0 .82h-3.04l-.12.6a4.99 4.99 0 0 1-.74 1.76l-.34.51 2.16 2.16a.4.4 0 0 1-.57.57L15.7 16.3l-.43-.44-.51.34c-.54.36-1.14.61-1.76.74l-.6.12v3.04a.4.4 0 1 1-.82 0v-3.04l-.6-.12a5 5 0 0 1-1.77-.74l-.55-.37-.43.5zM9 12a3 3 0 1 0 6 0 3 3 0 0 0-6 0z"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/general.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="#0C0C0D" fill-rule="evenodd">
+    <path fill-opacity=".8" fill-rule="nonzero" d="M8.24 16.32l.43-.5.55.37a5 5 0 0 0 1.77.74l.6.12v3.04a.4.4 0 1 0 .82 0v-3.04l.6-.12a4.99 4.99 0 0 0 1.76-.74l.51-.34.43.44L17.44 18a.4.4 0 0 0 .28.12c.11 0 .21-.04.3-.12a.4.4 0 0 0 0-.57l-2.17-2.16.34-.51c.36-.54.61-1.14.74-1.76l.12-.6h3.04a.4.4 0 1 0 0-.82h-3.04l-.12-.6a4.99 4.99 0 0 0-.74-1.76l-.34-.51.44-.43L18 6.56a.4.4 0 0 0-.57-.57l-2.16 2.16-.51-.34A4.99 4.99 0 0 0 13 7.07l-.6-.12V3.9a.4.4 0 1 0-.82 0v3.04l-.6.12c-.62.13-1.22.38-1.76.74l-.51.34-.43-.44L6.56 6a.4.4 0 0 0-.57.57l2.16 2.16-.34.51c-.36.54-.61 1.14-.74 1.76l-.12.6H3.9a.4.4 0 1 0 0 .82h3.04l.12.6a5 5 0 0 0 .74 1.77l.37.55-.5.43c-.12.1-.12.1-.16.11.02 0 .08-.04.12-.09L6 17.44a.4.4 0 0 0 .57.57l1.64-1.63c0-.02.02-.03.04-.06zm-.61 2.75a1.9 1.9 0 0 1-2.7 0 1.9 1.9 0 0 1 0-2.7l1.3-1.3a6.5 6.5 0 0 1-.48-1.16H3.91a1.9 1.9 0 1 1 0-3.82h1.84c.13-.4.29-.79.49-1.16l-1.31-1.3a1.9 1.9 0 0 1 2.7-2.7l1.3 1.3c.37-.19.76-.35 1.16-.48V3.91a1.9 1.9 0 1 1 3.82 0v1.84c.4.13.79.29 1.16.49l1.3-1.31a1.9 1.9 0 1 1 2.7 2.7l-1.3 1.3c.19.37.35.76.48 1.16h1.84a1.9 1.9 0 1 1 0 3.82h-1.84c-.13.4-.29.79-.49 1.16l1.31 1.3a1.9 1.9 0 0 1-2.7 2.7l-1.3-1.3c-.37.19-.76.35-1.16.48v1.84a1.9 1.9 0 1 1-3.82 0v-1.84a6.5 6.5 0 0 1-1.16-.49l-1.3 1.3zM9 12a3 3 0 1 1 6 0 3 3 0 0 1-6 0zm1 0a2 2 0 1 0 4 0 2 2 0 0 0-4 0z"/>
+    <path fill-opacity=".3" d="M8.24 16.32l-.04.06L6.56 18a.4.4 0 0 1-.28.12.4.4 0 0 1-.29-.7l1.65-1.65a.53.53 0 0 1-.12.1l.16-.12.5-.43-.37-.55A5 5 0 0 1 7.07 13l-.12-.6H3.9a.4.4 0 1 1 0-.82h3.04l.12-.6c.13-.62.38-1.22.74-1.76l.34-.51-2.16-2.16A.4.4 0 0 1 6.56 6L8.3 7.7l.43.44.51-.34c.54-.36 1.14-.61 1.76-.74l.6-.12V3.9a.4.4 0 1 1 .82 0v3.04l.6.12c.62.13 1.22.38 1.76.74l.51.34 2.16-2.16a.4.4 0 1 1 .57.57L16.29 8.3l-.44.43.34.51c.36.54.61 1.14.74 1.76l.12.6h3.04a.4.4 0 1 1 0 .82h-3.04l-.12.6a4.99 4.99 0 0 1-.74 1.76l-.34.51 2.16 2.16a.4.4 0 0 1-.57.57L15.7 16.3l-.43-.44-.51.34c-.54.36-1.14.61-1.76.74l-.6.12v3.04a.4.4 0 1 1-.82 0v-3.04l-.6-.12a5 5 0 0 1-1.77-.74l-.55-.37-.43.5zM9 12a3 3 0 1 0 6 0 3 3 0 0 0-6 0z"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/logo-android.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+  <path fill="#0C0C0D" fill-rule="evenodd" d="M9.24 16.03v2.73c0 .7-.56 1.24-1.25 1.24-.7 0-1.26-.55-1.26-1.24v-2.73h-.9c-.75 0-1.35-.59-1.35-1.33v-8h11.2v8c0 .74-.6 1.33-1.36 1.33h-.9v2.73c0 .7-.55 1.24-1.25 1.24s-1.26-.55-1.26-1.24v-2.73H9.24zM2.76 6.5c.7 0 1.25.55 1.25 1.24v5.15c0 .7-.56 1.24-1.25 1.24-.7 0-1.26-.55-1.26-1.24V7.73c0-.69.56-1.24 1.26-1.24zm14.64 0c.7 0 1.25.55 1.25 1.24v5.15c0 .7-.55 1.24-1.25 1.24s-1.26-.55-1.26-1.24V7.73c0-.69.56-1.24 1.26-1.24zM6.6 0c.06 0 .12.03.16.1l.9 1.58a6.04 6.04 0 0 1 4.84 0L13.4.1a.18.18 0 0 1 .24-.07c.09.05.12.15.07.24l-.89 1.58a5.04 5.04 0 0 1 2.86 4.43H4.48c0-1.9 1.15-3.56 2.85-4.43L6.45.26a.17.17 0 0 1 .07-.24A.18.18 0 0 1 6.6 0zm.9 3.33c-.26 0-.47.2-.47.46a.47.47 0 0 0 .93 0 .47.47 0 0 0-.47-.46zm5.16 0c-.25 0-.47.2-.47.46a.47.47 0 0 0 .94 0 .47.47 0 0 0-.47-.46z"/>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/logo-ios.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+  <path fill="#000000" fill-rule="evenodd" d="M16.84 15.03c-.27.63-.59 1.2-.96 1.74-.51.72-.93 1.23-1.25 1.5-.5.46-1.03.7-1.6.71-.41 0-.9-.12-1.48-.35a4.25 4.25 0 0 0-1.6-.36c-.5 0-1.05.12-1.63.36A4.4 4.4 0 0 1 6.9 19c-.55.02-1.1-.22-1.64-.73-.35-.3-.78-.82-1.3-1.56-.56-.78-1.02-1.7-1.38-2.73A10.03 10.03 0 0 1 2 10.7c0-1.2.26-2.25.78-3.12a4.6 4.6 0 0 1 3.86-2.28c.43 0 1 .13 1.71.4.71.26 1.16.4 1.36.4.15 0 .66-.16 1.51-.47.8-.3 1.5-.41 2.05-.37 1.51.13 2.65.72 3.4 1.8a3.8 3.8 0 0 0-2 3.44 4.1 4.1 0 0 0 2.5 3.68c-.1.3-.21.57-.33.84zM13.37 1.36c0 .9-.33 1.74-.98 2.52-.8.92-1.75 1.46-2.79 1.37a3.95 3.95 0 0 1 1.02-2.89c.34-.38.76-.7 1.28-.95.51-.25 1-.39 1.45-.41.02.12.02.24.02.36z"/>
+</svg>
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -13,16 +13,30 @@
 }
 
 description.indent,
 .indent > description {
   font-size: 1.18rem;
   color: #737373;
 }
 
+.face-sad {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/face-sad.svg");
+  width: 20px;
+  height: 20px;
+  margin-inline-end: 8px;
+}
+
+.face-smile {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/face-smile.svg");
+  width: 20px;
+  height: 20px;
+  margin-inline-end: 8px;
+}
+
 * {
   -moz-user-select: text;
 }
 
 button,
 treecol,
 html|option {
   /* override the * rule */
@@ -612,20 +626,21 @@ groupbox {
 .help-button {
   position: fixed;
   left: 0;
   /* Needs to have enough gap from the bottom to not
      get behind the status panel (bug 1357841). */
   bottom: 2rem;
   font-size: 13px;
   line-height: 13px;
-  height: 14px;
   background-position: 15px;
   padding-inline-start: 35px;
   white-space: nowrap;
+  fill: #0C0C0D;
+  stroke: #0C0C0D;
 }
 
 .help-button:-moz-locale-dir(rtl) {
   left: auto;
   right: 0;
   background-position: right 15px top 0;
 }
 
@@ -688,8 +703,56 @@ menulist[indicator=true] > menupopup men
 
 menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .menu-iconic-left > .menu-iconic-icon:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
 .menu-iconic-highlightable-text {
   margin: 0; /* Align with the margin of xul:label.menu-iconic-text */
 }
+
+%ifdef MOZ_PHOTON_PREFERENCES
+
+#category-general > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/general.svg");
+}
+
+#category-general[selected=true] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/general-focused.svg");
+}
+
+#category-search > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/search.svg");
+}
+
+#category-search[selected=true] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/search-focused.svg");
+}
+
+#category-privacy > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/privacy-security.svg");
+}
+
+#category-privacy[selected=true] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/privacy-security-focused.svg");
+}
+
+#category-sync > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/fxa.svg");
+}
+
+#category-sync[selected=true] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/fxa-focused.svg");
+}
+
+#fxaProfileImage {
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/fxa-avatar.svg");
+}
+
+#fxaMobilePromo-android-hasFxaAccount {
+  background-image: url("chrome://browser/skin/preferences/in-content-new/logo-android.svg");
+}
+
+#fxaMobilePromo-ios-hasFxaAccount {
+  background-image: url("chrome://browser/skin/preferences/in-content-new/logo-ios.svg");
+}
+
+%endif
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/privacy-security-focused.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+  <defs>
+    <path id="a" d="M5 13v7h14v-7H5zm-.5-2h15c.83 0 1.5.62 1.5 1.38v8.24c0 .76-.67 1.38-1.5 1.38h-15c-.83 0-1.5-.62-1.5-1.38v-8.25c0-.75.67-1.37 1.5-1.37z"/>
+    <rect id="b" width="12" height="10.16" x="6" y="1"/>
+    <path id="d" d="M8 8.33v6.34c0 2.38 1.81 4.3 4 4.3s4-1.91 4-4.3V8.33c0-2.38-1.81-4.3-4-4.3s-4 1.91-4 4.3zm-2 0C6 4.83 8.69 2 12 2s6 2.84 6 6.33v6.34c0 3.5-2.69 6.33-6 6.33s-6-2.84-6-6.33V8.33z"/>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <g fill-rule="nonzero">
+      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#a"/>
+      <use fill="#0A84FF" fill-rule="evenodd" xlink:href="#a"/>
+    </g>
+    <polygon fill="#0A84FF" fill-opacity=".5" points="5 13 5 20 19 20 19 13"/>
+    <mask id="c" fill="white">
+      <use xlink:href="#b"/>
+    </mask>
+    <g fill-rule="nonzero" mask="url(#c)">
+      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#d"/>
+      <use fill="#0A84FF" fill-rule="evenodd" xlink:href="#d"/>
+    </g>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/privacy-security.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+  <defs>
+    <path id="a" d="M5 13v7h14v-7H5zm-.5-2h15c.83 0 1.5.62 1.5 1.38v8.24c0 .76-.67 1.38-1.5 1.38h-15c-.83 0-1.5-.62-1.5-1.38v-8.25c0-.75.67-1.37 1.5-1.37z"/>
+    <rect id="b" width="12" height="10.16" x="6" y="1"/>
+    <path id="d" d="M8 8.33v6.34c0 2.38 1.81 4.3 4 4.3s4-1.91 4-4.3V8.33c0-2.38-1.81-4.3-4-4.3s-4 1.91-4 4.3zm-2 0C6 4.83 8.69 2 12 2s6 2.84 6 6.33v6.34c0 3.5-2.69 6.33-6 6.33s-6-2.84-6-6.33V8.33z"/>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <g fill-rule="nonzero">
+      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#a"/>
+      <use fill="#0C0C0D" fill-opacity=".8" fill-rule="evenodd" xlink:href="#a"/>
+    </g>
+    <polygon fill="#0C0C0D" fill-opacity=".3" points="5 13 5 20 19 20 19 13"/>
+    <mask id="c" fill="white">
+      <use xlink:href="#b"/>
+    </mask>
+    <g fill-rule="nonzero" mask="url(#c)">
+      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#d"/>
+      <use fill="#0C0C0D" fill-opacity=".8" fill-rule="evenodd" xlink:href="#d"/>
+    </g>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/search-focused.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="#0A84FF" fill-rule="evenodd">
+    <path fill-opacity=".3" d="M5 10a6 6 0 1 0 12.01-.01A6 6 0 0 0 5 10z"/>
+    <path fill-rule="nonzero" d="M17.32 14.9l4.35 4.36a1 1 0 0 1-1.41 1.41l-4.36-4.35a8 8 0 1 1 1.41-1.41zM5 10a6 6 0 1 0 12.01-.01A6 6 0 0 0 5 10zm11 0a.5.5 0 1 1-1 0 4 4 0 0 0-4-4 .5.5 0 1 1 0-1 5 5 0 0 1 5 5z"/>
+  </g>
+</svg>
new file mode 100755
--- /dev/null
+++ b/browser/themes/shared/incontentprefs/search.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#0C0C0D" fill-opacity=".1" d="M5 10a6 6 0 1 0 12.01-.01A6 6 0 0 0 5 10z"/>
+    <path fill="#000000" fill-opacity=".8" fill-rule="nonzero" d="M17.32 14.9l4.35 4.36a1 1 0 0 1-1.41 1.41l-4.36-4.35a8 8 0 1 1 1.41-1.41zM5 10a6 6 0 1 0 12.01-.01A6 6 0 0 0 5 10zm11 0a.5.5 0 1 1-1 0 4 4 0 0 0-4-4 .5.5 0 1 1 0-1 5 5 0 0 1 5 5z"/>
+  </g>
+</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -87,20 +87,33 @@
   skin/classic/browser/panel-icon-arrow-right.svg              (../shared/panel-icon-arrow-right.svg)
   skin/classic/browser/panel-icon-cancel.svg                   (../shared/panel-icon-cancel.svg)
 #ifndef XP_MACOSX
   skin/classic/browser/panel-icon-folder.svg                   (../shared/panel-icon-folder.svg)
 #else
   skin/classic/browser/panel-icon-magnifier.svg                (../shared/panel-icon-magnifier.svg)
 #endif
   skin/classic/browser/panel-icon-retry.svg                    (../shared/panel-icon-retry.svg)
+  skin/classic/browser/preferences/in-content-new/face-sad.svg     (../shared/incontentprefs/face-sad.svg)
+  skin/classic/browser/preferences/in-content-new/face-smile.svg   (../shared/incontentprefs/face-smile.svg)
   skin/classic/browser/preferences/in-content-new/favicon.ico      (../shared/incontentprefs/favicon.ico)
+  skin/classic/browser/preferences/in-content-new/fxa-avatar.svg   (../shared/incontentprefs/fxa-avatar.svg)
+  skin/classic/browser/preferences/in-content-new/fxa-focused.svg  (../shared/incontentprefs/fxa-focused.svg)
+  skin/classic/browser/preferences/in-content-new/fxa.svg          (../shared/incontentprefs/fxa.svg)
+  skin/classic/browser/preferences/in-content-new/general-focused.svg  (../shared/incontentprefs/general-focused.svg)
+  skin/classic/browser/preferences/in-content-new/general.svg      (../shared/incontentprefs/general.svg)
   skin/classic/browser/preferences/in-content-new/icons.svg        (../shared/incontentprefs/icons.svg)
+  skin/classic/browser/preferences/in-content-new/logo-android.svg (../shared/incontentprefs/logo-android.svg)
+  skin/classic/browser/preferences/in-content-new/logo-ios.svg     (../shared/incontentprefs/logo-ios.svg)
+  skin/classic/browser/preferences/in-content-new/privacy-security-focused.svg  (../shared/incontentprefs/privacy-security-focused.svg)
+  skin/classic/browser/preferences/in-content-new/privacy-security.svg          (../shared/incontentprefs/privacy-security.svg)
   skin/classic/browser/preferences/in-content-new/search-arrow-indicator.svg  (../shared/incontentprefs/search-arrow-indicator.svg)
+  skin/classic/browser/preferences/in-content-new/search-focused.svg  (../shared/incontentprefs/search-focused.svg)
   skin/classic/browser/preferences/in-content-new/search.css       (../shared/incontentprefs/search.css)
+  skin/classic/browser/preferences/in-content-new/search.svg       (../shared/incontentprefs/search.svg)
   skin/classic/browser/preferences/in-content-new/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
 * skin/classic/browser/preferences/in-content-new/containers.css   (../shared/incontentprefs/containers.css)
   skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs-old/favicon.ico)
   skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs-old/icons.svg)
   skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs-old/search.css)
 * skin/classic/browser/preferences/in-content/containers.css   (../shared/incontentprefs-old/containers.css)
 * skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
   skin/classic/browser/fxa/default-avatar.svg                  (../shared/fxa/default-avatar.svg)