Bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. r=jaws
☠☠ backed out by fe3c79839a88 ☠ ☠
authorTim Nguyen <ntim.bugs@gmail.com>
Wed, 15 Apr 2020 19:59:46 +0000
changeset 524234 05d18c70a0bdf435c95ca4bcc7f452eb06abe400
parent 524233 60f42302b5d56aa9c2d9cd1ff31d96ab63dafd2a
child 524235 a6904ec3d1e0cf35865779c117eb9d081a815449
push id113067
push userntim.bugs@gmail.com
push dateWed, 15 Apr 2020 20:13:21 +0000
treeherderautoland@05d18c70a0bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1630201
milestone77.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. r=jaws Depends on D71019 Differential Revision: https://phabricator.services.mozilla.com/D71020
browser/components/aboutconfig/content/aboutconfig.css
browser/components/preferences/in-content/fxaPairDevice.xhtml
browser/components/preferences/in-content/preferences.xhtml
browser/components/preferences/siteDataRemoveSelected.xhtml
browser/components/preferences/siteDataSettings.xhtml
browser/themes/linux/preferences/dialog.css
browser/themes/linux/preferences/preferences.css
browser/themes/osx/preferences/dialog.css
browser/themes/osx/preferences/preferences.css
browser/themes/shared/incontentprefs/bookmark.svg
browser/themes/shared/incontentprefs/containers.css
browser/themes/shared/incontentprefs/critters-postcard.jpg
browser/themes/shared/incontentprefs/dialog.inc.css
browser/themes/shared/incontentprefs/extensions.svg
browser/themes/shared/incontentprefs/face-sad.svg
browser/themes/shared/incontentprefs/face-smile.svg
browser/themes/shared/incontentprefs/formfill.svg
browser/themes/shared/incontentprefs/fxaPairDevice.css
browser/themes/shared/incontentprefs/general.svg
browser/themes/shared/incontentprefs/history.svg
browser/themes/shared/incontentprefs/no-search-bar.svg
browser/themes/shared/incontentprefs/no-search-results.svg
browser/themes/shared/incontentprefs/preferences.inc.css
browser/themes/shared/incontentprefs/preferences.svg
browser/themes/shared/incontentprefs/privacy-security.svg
browser/themes/shared/incontentprefs/privacy.css
browser/themes/shared/incontentprefs/search-arrow-indicator.svg
browser/themes/shared/incontentprefs/search-bar.svg
browser/themes/shared/incontentprefs/search.css
browser/themes/shared/incontentprefs/search.svg
browser/themes/shared/incontentprefs/siteDataSettings.css
browser/themes/shared/incontentprefs/sync.svg
browser/themes/shared/incontentprefs/tab.svg
browser/themes/shared/jar.inc.mn
browser/themes/shared/preferences/bookmark.svg
browser/themes/shared/preferences/critters-postcard.jpg
browser/themes/shared/preferences/dialog.inc.css
browser/themes/shared/preferences/extensions.svg
browser/themes/shared/preferences/face-sad.svg
browser/themes/shared/preferences/face-smile.svg
browser/themes/shared/preferences/formfill.svg
browser/themes/shared/preferences/fxaPairDevice.css
browser/themes/shared/preferences/general.svg
browser/themes/shared/preferences/history.svg
browser/themes/shared/preferences/no-search-bar.svg
browser/themes/shared/preferences/no-search-results.svg
browser/themes/shared/preferences/preferences.inc.css
browser/themes/shared/preferences/preferences.svg
browser/themes/shared/preferences/privacy-security.svg
browser/themes/shared/preferences/privacy.css
browser/themes/shared/preferences/search-arrow-indicator.svg
browser/themes/shared/preferences/search-bar.svg
browser/themes/shared/preferences/search.css
browser/themes/shared/preferences/search.svg
browser/themes/shared/preferences/siteDataSettings.css
browser/themes/shared/preferences/sync.svg
browser/themes/shared/preferences/tab.svg
browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
browser/themes/windows/preferences/dialog.css
browser/themes/windows/preferences/preferences.css
toolkit/content/aboutTelemetry.css
toolkit/themes/shared/in-content/common.inc.css
--- a/browser/components/aboutconfig/content/aboutconfig.css
+++ b/browser/components/aboutconfig/content/aboutconfig.css
@@ -106,17 +106,17 @@
 }
 
 #prefs > tr.has-user-value {
   font-weight: bold;
 }
 
 #prefs > tr.locked {
   opacity: 0.4;
-  background-image: url("chrome://browser/skin/preferences/in-content/privacy-security.svg");
+  background-image: url("chrome://browser/skin/preferences/privacy-security.svg");
   background-repeat: no-repeat;
   background-position: 9px center;
   background-size: 16px 16px;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #prefs > tr.locked:dir(rtl) {
--- a/browser/components/preferences/in-content/fxaPairDevice.xhtml
+++ b/browser/components/preferences/in-content/fxaPairDevice.xhtml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
 <!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/fxaPairDevice.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/fxaPairDevice.css" type="text/css"?>
 
 <window id="fxaPairDeviceDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         role="dialog"
         onload="gFxaPairDeviceDialog.init();"
         onunload="gFxaPairDeviceDialog.uninit()"
         data-l10n-id="fxa-pair-device-dialog"
--- a/browser/components/preferences/in-content/preferences.xhtml
+++ b/browser/components/preferences/in-content/preferences.xhtml
@@ -4,19 +4,19 @@
    - You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:html="http://www.w3.org/1999/xhtml"
         role="document"
         id="preferences-root">
 
--- a/browser/components/preferences/siteDataRemoveSelected.xhtml
+++ b/browser/components/preferences/siteDataRemoveSelected.xhtml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
 <window windowtype="Browser:SiteDataRemoveSelected"
         width="500"
         data-l10n-id="site-data-removing-dialog"
         data-l10n-attrs="title"
         onload="gSiteDataRemoveSelected.init();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
--- a/browser/components/preferences/siteDataSettings.xhtml
+++ b/browser/components/preferences/siteDataSettings.xhtml
@@ -2,17 +2,17 @@
 
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
 <window id="SiteDataSettingsDialog" windowtype="Browser:SiteDataSettings"
         data-l10n-id="site-data-settings-window"
         data-l10n-attrs="title"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="width: 45em;"
         onload="gSiteDataSettings.init();"
--- a/browser/themes/linux/preferences/dialog.css
+++ b/browser/themes/linux/preferences/dialog.css
@@ -1,10 +1,10 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 :root > * {
   font-size: 1.05em;
 }
 
--- a/browser/themes/linux/preferences/preferences.css
+++ b/browser/themes/linux/preferences/preferences.css
@@ -1,13 +1,13 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 /* Global rules */
 body {
   font-size: 1.11em;
 }
 
 .treecol-sortdirection {
   /* override the Linux only toolkit rule */
--- a/browser/themes/osx/preferences/dialog.css
+++ b/browser/themes/osx/preferences/dialog.css
@@ -1,13 +1,13 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 window {
   font: message-box !important;
 }
 
 :root > * {
   font-size: 1.18em;
 }
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -1,13 +1,13 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 body {
   font-size: 1.36em;
 }
 
 tabpanels {
   padding: 20px 7px 7px;
 }
deleted file mode 100644
--- a/browser/themes/shared/incontentprefs/containers.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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/. */
-
-%include ../../../components/contextualidentity/content/usercontext.css
-
-.container-header-links {
-  font-size: 1.25rem;
-  margin-block-end: 15px;
-}
-
-[data-identity-icon] {
-  margin: 0;
-  margin-inline-end: 16px;
-}
-
-#containersView {
-  border: 0 none;
-  background: transparent;
-}
-
-#containersView richlistitem {
-  padding-block: 4px;
-  border-block-end: 1px solid var(--in-content-box-border-color);
-}
-
-#containersView richlistitem:last-of-type {
-  border-block-end: 0 none;
-  margin-block-end: 8px;
-}
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -108,38 +108,38 @@
 #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/toolbar-drag-indicator.svg              (../shared/toolbar-drag-indicator.svg)
 
-  skin/classic/browser/preferences/in-content/bookmark.svg     (../shared/incontentprefs/bookmark.svg)
-  skin/classic/browser/preferences/in-content/critters-postcard.jpg       (../shared/incontentprefs/critters-postcard.jpg)
-  skin/classic/browser/preferences/in-content/extensions.svg   (../shared/incontentprefs/extensions.svg)
-  skin/classic/browser/preferences/in-content/face-sad.svg      (../shared/incontentprefs/face-sad.svg)
-  skin/classic/browser/preferences/in-content/face-smile.svg    (../shared/incontentprefs/face-smile.svg)
-  skin/classic/browser/preferences/in-content/formfill.svg      (../shared/incontentprefs/formfill.svg)
-  skin/classic/browser/preferences/in-content/fxaPairDevice.css (../shared/incontentprefs/fxaPairDevice.css)
-  skin/classic/browser/preferences/in-content/general.svg       (../shared/incontentprefs/general.svg)
-  skin/classic/browser/preferences/in-content/history.svg       (../shared/incontentprefs/history.svg)
-  skin/classic/browser/preferences/in-content/no-search-bar.svg           (../shared/incontentprefs/no-search-bar.svg)
-  skin/classic/browser/preferences/in-content/no-search-results.svg       (../shared/incontentprefs/no-search-results.svg)
-  skin/classic/browser/preferences/in-content/preferences.svg   (../shared/incontentprefs/preferences.svg)
-  skin/classic/browser/preferences/in-content/privacy-security.svg        (../shared/incontentprefs/privacy-security.svg)
-  skin/classic/browser/preferences/in-content/privacy.css      (../shared/incontentprefs/privacy.css)
-  skin/classic/browser/preferences/in-content/search-arrow-indicator.svg  (../shared/incontentprefs/search-arrow-indicator.svg)
-  skin/classic/browser/preferences/in-content/search-bar.svg   (../shared/incontentprefs/search-bar.svg)
-  skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs/search.css)
-  skin/classic/browser/preferences/in-content/search.svg       (../shared/incontentprefs/search.svg)
-  skin/classic/browser/preferences/in-content/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
-  skin/classic/browser/preferences/in-content/sync.svg         (../shared/incontentprefs/sync.svg)
-  skin/classic/browser/preferences/in-content/tab.svg          (../shared/incontentprefs/tab.svg)
-* skin/classic/browser/preferences/in-content/containers.css   (../shared/incontentprefs/containers.css)
+  skin/classic/browser/preferences/bookmark.svg                (../shared/preferences/bookmark.svg)
+  skin/classic/browser/preferences/critters-postcard.jpg       (../shared/preferences/critters-postcard.jpg)
+  skin/classic/browser/preferences/extensions.svg              (../shared/preferences/extensions.svg)
+  skin/classic/browser/preferences/face-sad.svg                (../shared/preferences/face-sad.svg)
+  skin/classic/browser/preferences/face-smile.svg              (../shared/preferences/face-smile.svg)
+  skin/classic/browser/preferences/formfill.svg                (../shared/preferences/formfill.svg)
+  skin/classic/browser/preferences/fxaPairDevice.css           (../shared/preferences/fxaPairDevice.css)
+  skin/classic/browser/preferences/general.svg                 (../shared/preferences/general.svg)
+  skin/classic/browser/preferences/history.svg                 (../shared/preferences/history.svg)
+  skin/classic/browser/preferences/no-search-bar.svg           (../shared/preferences/no-search-bar.svg)
+  skin/classic/browser/preferences/no-search-results.svg       (../shared/preferences/no-search-results.svg)
+  skin/classic/browser/preferences/preferences.svg             (../shared/preferences/preferences.svg)
+  skin/classic/browser/preferences/privacy-security.svg        (../shared/preferences/privacy-security.svg)
+  skin/classic/browser/preferences/privacy.css                 (../shared/preferences/privacy.css)
+  skin/classic/browser/preferences/search-arrow-indicator.svg  (../shared/preferences/search-arrow-indicator.svg)
+  skin/classic/browser/preferences/search-bar.svg              (../shared/preferences/search-bar.svg)
+  skin/classic/browser/preferences/search.css                  (../shared/preferences/search.css)
+  skin/classic/browser/preferences/search.svg                  (../shared/preferences/search.svg)
+  skin/classic/browser/preferences/siteDataSettings.css        (../shared/preferences/siteDataSettings.css)
+  skin/classic/browser/preferences/sync.svg                    (../shared/preferences/sync.svg)
+  skin/classic/browser/preferences/tab.svg                     (../shared/preferences/tab.svg)
+* skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
 * skin/classic/browser/preferences/containers-dialog.css       (../shared/preferences/containers-dialog.css)
   skin/classic/browser/fxa/fxa-spinner.svg                     (../shared/fxa/fxa-spinner.svg)
   skin/classic/browser/fxa/sync-illustration.svg               (../shared/fxa/sync-illustration.svg)
   skin/classic/browser/fxa/sync-illustration-issue.svg         (../shared/fxa/sync-illustration-issue.svg)
   skin/classic/browser/fxa/send-to-device.svg                  (../shared/fxa/send-to-device.svg)
 
   skin/classic/browser/fxa/avatar.svg                          (../shared/fxa/avatar.svg)
   skin/classic/browser/fxa/avatar-alert.svg                    (../shared/fxa/avatar-alert.svg)
rename from browser/themes/shared/incontentprefs/bookmark.svg
rename to browser/themes/shared/preferences/bookmark.svg
rename from browser/themes/shared/incontentprefs/critters-postcard.jpg
rename to browser/themes/shared/preferences/critters-postcard.jpg
rename from browser/themes/shared/incontentprefs/dialog.inc.css
rename to browser/themes/shared/preferences/dialog.inc.css
rename from browser/themes/shared/incontentprefs/extensions.svg
rename to browser/themes/shared/preferences/extensions.svg
rename from browser/themes/shared/incontentprefs/face-sad.svg
rename to browser/themes/shared/preferences/face-sad.svg
rename from browser/themes/shared/incontentprefs/face-smile.svg
rename to browser/themes/shared/preferences/face-smile.svg
rename from browser/themes/shared/incontentprefs/formfill.svg
rename to browser/themes/shared/preferences/formfill.svg
rename from browser/themes/shared/incontentprefs/fxaPairDevice.css
rename to browser/themes/shared/preferences/fxaPairDevice.css
rename from browser/themes/shared/incontentprefs/general.svg
rename to browser/themes/shared/preferences/general.svg
rename from browser/themes/shared/incontentprefs/history.svg
rename to browser/themes/shared/preferences/history.svg
rename from browser/themes/shared/incontentprefs/no-search-bar.svg
rename to browser/themes/shared/preferences/no-search-bar.svg
rename from browser/themes/shared/incontentprefs/no-search-results.svg
rename to browser/themes/shared/preferences/no-search-results.svg
rename from browser/themes/shared/incontentprefs/preferences.inc.css
rename to browser/themes/shared/preferences/preferences.inc.css
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/preferences/preferences.inc.css
@@ -187,33 +187,33 @@ button > hbox > label {
 /* Category List */
 
 #categories {
   overflow: visible !important; /* Cancel scrollbar and do not clip overflow content when window size goes very small */
   padding: 1px; /* Adding padding around richlistitem in order to make entire keyboard focusing outline visible */
 }
 
 #category-general > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  list-style-image: url("chrome://browser/skin/preferences/general.svg");
 }
 
 #category-home > .category-icon {
   list-style-image: url("chrome://browser/skin/home.svg");
 }
 
 #category-search > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/search.svg");
+  list-style-image: url("chrome://browser/skin/preferences/search.svg");
 }
 
 #category-privacy > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/privacy-security.svg");
+  list-style-image: url("chrome://browser/skin/preferences/privacy-security.svg");
 }
 
 #category-sync > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/sync.svg");
+  list-style-image: url("chrome://browser/skin/preferences/sync.svg");
 }
 
 /* header */
 .header {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
@@ -758,47 +758,47 @@ dialog > .sync-engines-list + hbox {
 }
 
 .sync-engines-list > div:not([hidden]) {
   display: flex;
 }
 
 .sync-engine-bookmarks .checkbox-icon,
 .sync-engine-bookmarks.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/bookmark.svg");
+  list-style-image: url("chrome://browser/skin/preferences/bookmark.svg");
 }
 
 .sync-engine-history .checkbox-icon,
 .sync-engine-history.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/history.svg");
+  list-style-image: url("chrome://browser/skin/preferences/history.svg");
 }
 
 .sync-engine-tabs .checkbox-icon,
 .sync-engine-tabs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/tab.svg");
+  list-style-image: url("chrome://browser/skin/preferences/tab.svg");
 }
 
 .sync-engine-passwords .checkbox-icon,
 .sync-engine-passwords.sync-engine-image {
   list-style-image: url("chrome://browser/skin/login.svg");
 }
 
 .sync-engine-addons .checkbox-icon,
 .sync-engine-addons.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/extensions.svg");
+  list-style-image: url("chrome://browser/skin/preferences/extensions.svg");
 }
 
 .sync-engine-prefs .checkbox-icon,
 .sync-engine-prefs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/preferences.svg");
+  list-style-image: url("chrome://browser/skin/preferences/preferences.svg");
 }
 
 .sync-engine-addresses .checkbox-icon,
 .sync-engine-addresses.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/formfill.svg");
+  list-style-image: url("chrome://browser/skin/preferences/formfill.svg");
 }
 
 .fxaMobilePromo {
   margin-top: 2px !important;
 }
 
 .androidIcon,
 .iOSIcon {
@@ -834,25 +834,25 @@ image.update-throbber {
 }
 
 .navigation {
   overflow-x: hidden;
   overflow-y: auto;
 }
 
 .face-sad {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/face-sad.svg");
+  list-style-image: url("chrome://browser/skin/preferences/face-sad.svg");
   width: 20px;
   height: 20px;
   margin-block: 5px;
   margin-inline-end: 8px;
 }
 
 .face-smile {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/face-smile.svg");
+  list-style-image: url("chrome://browser/skin/preferences/face-smile.svg");
   width: 20px;
   height: 20px;
   margin-block: 5px;
   margin-inline-end: 8px;
 }
 
 #policies-container,
 #searchInput {
@@ -958,17 +958,17 @@ menulist[indicator=true] > menupopup men
 
 menulist[indicator=true] > menupopup menuitem:not([image]) > .menu-iconic-left > .menu-iconic-icon {
   width: 8px;
   height: 10px;
   margin: 0;
 }
 
 menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url(chrome://browser/skin/preferences/in-content/search-arrow-indicator.svg);
+  list-style-image: url(chrome://browser/skin/preferences/search-arrow-indicator.svg);
 }
 
 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 */
@@ -979,23 +979,23 @@ menulist[indicator=true] > menupopup men
   line-height: 30px;
 }
 
 .no-results-image-container {
   margin-top: 64px;
 }
 
 .no-results-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/no-search-results.svg");
+  list-style-image: url("chrome://browser/skin/preferences/no-search-results.svg");
   width: 380px;
   height: 293px;
 }
 
 #no-results-message[query*=🔥🦊] {
-  background-image: url("chrome://browser/skin/preferences/in-content/critters-postcard.jpg");
+  background-image: url("chrome://browser/skin/preferences/critters-postcard.jpg");
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
 }
 
 #no-results-message[query*=🔥🦊] > .no-results-container {
   visibility: hidden;
 }
rename from browser/themes/shared/incontentprefs/preferences.svg
rename to browser/themes/shared/preferences/preferences.svg
rename from browser/themes/shared/incontentprefs/privacy-security.svg
rename to browser/themes/shared/preferences/privacy-security.svg
rename from browser/themes/shared/incontentprefs/privacy.css
rename to browser/themes/shared/preferences/privacy.css
rename from browser/themes/shared/incontentprefs/search-arrow-indicator.svg
rename to browser/themes/shared/preferences/search-arrow-indicator.svg
rename from browser/themes/shared/incontentprefs/search-bar.svg
rename to browser/themes/shared/preferences/search-bar.svg
rename from browser/themes/shared/incontentprefs/search.css
rename to browser/themes/shared/preferences/search.css
--- a/browser/themes/shared/incontentprefs/search.css
+++ b/browser/themes/shared/preferences/search.css
@@ -11,26 +11,26 @@
   stroke: var(--in-content-box-border-color);
 }
 
 .searchBarImage:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
 .searchBarHiddenImage {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/no-search-bar.svg");
+  list-style-image: url("chrome://browser/skin/preferences/no-search-bar.svg");
 }
 
 #searchBarShownRadio {
   /* Allow a little visual space to separate the radio from the image above it. */
   margin-top: 10px;
 }
 
 .searchBarShownImage {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/search-bar.svg");
+  list-style-image: url("chrome://browser/skin/preferences/search-bar.svg");
 }
 
 #defaultEngine,
 #defaultPrivateEngine {
   margin-inline-start: 0;
 }
 
 #defaultEngine::part(icon),
rename from browser/themes/shared/incontentprefs/search.svg
rename to browser/themes/shared/preferences/search.svg
rename from browser/themes/shared/incontentprefs/siteDataSettings.css
rename to browser/themes/shared/preferences/siteDataSettings.css
rename from browser/themes/shared/incontentprefs/sync.svg
rename to browser/themes/shared/preferences/sync.svg
rename from browser/themes/shared/incontentprefs/tab.svg
rename to browser/themes/shared/preferences/tab.svg
--- a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+++ b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
@@ -166,17 +166,17 @@ p {
   width: 100%;
   background-color: var(--in-content-banner-background);
   color: var(--in-content-banner-text-color);
 }
 
 .banner-body {
   margin: auto;
   width: max-content;
-  background-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  background-image: url("chrome://browser/skin/preferences/general.svg");
   background-position: left 0 top 50px;
   background-repeat: no-repeat;
   background-size: 32px;
   letter-spacing: -.2px;
   padding: 50px 0;
   padding-inline-start: 44px;
 }
 
--- a/browser/themes/windows/preferences/dialog.css
+++ b/browser/themes/windows/preferences/dialog.css
@@ -1,9 +1,9 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 :root > * {
   font-size: 1.12em;
 }
--- a/browser/themes/windows/preferences/preferences.css
+++ b/browser/themes/windows/preferences/preferences.css
@@ -1,13 +1,13 @@
 /* - 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/. */
 
-%include ../../shared/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 /* Global rules */
 body {
   font-size: 1.25em;
 }
 
 /* Modeless Window Dialogs */
 
--- a/toolkit/content/aboutTelemetry.css
+++ b/toolkit/content/aboutTelemetry.css
@@ -165,17 +165,17 @@ section:not(.active) {
 }
 
 #no-search-results-text {
   font-size: 17px;
   margin-bottom: 2em;
 }
 
 .no-search-results-image {
-  background-image: url("chrome://browser/skin/preferences/in-content/no-search-results.svg");
+  background-image: url("chrome://browser/skin/preferences/no-search-results.svg");
   width: 380px;
   height: 293px;
 }
 
 .hidden {
   display: none !important;
 }
 
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -1107,17 +1107,17 @@ xul|*.help-icon {
   list-style-image: url("chrome://global/skin/icons/help.svg");
 }
 
 html|*.help-icon {
   background-image: url("chrome://global/skin/icons/help.svg");
 }
 
 .preferences-icon {
-  background-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  background-image: url("chrome://browser/skin/preferences/general.svg");
 }
 
 .addons-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg");
   /* The add-ons icon doesn't have much (any?) margin, so make it a bit smaller. */
   width: 14px;
   height: 14px;
   margin-inline-start: 15px;