Backed out changeset 05d18c70a0bd (bug 1630201)
Backed out changeset 60f42302b5d5 (bug 1630201)

--HG--
rename : browser/themes/shared/preferences/bookmark.svg => browser/themes/shared/incontentprefs/bookmark.svg
rename : browser/themes/shared/preferences/critters-postcard.jpg => browser/themes/shared/incontentprefs/critters-postcard.jpg
rename : browser/themes/shared/preferences/dialog.inc.css => browser/themes/shared/incontentprefs/dialog.inc.css
rename : browser/themes/shared/preferences/extensions.svg => browser/themes/shared/incontentprefs/extensions.svg
rename : browser/themes/shared/preferences/face-sad.svg => browser/themes/shared/incontentprefs/face-sad.svg
rename : browser/themes/shared/preferences/face-smile.svg => browser/themes/shared/incontentprefs/face-smile.svg
rename : browser/themes/shared/preferences/formfill.svg => browser/themes/shared/incontentprefs/formfill.svg
rename : browser/themes/shared/preferences/fxaPairDevice.css => browser/themes/shared/incontentprefs/fxaPairDevice.css
rename : browser/themes/shared/preferences/general.svg => browser/themes/shared/incontentprefs/general.svg
rename : browser/themes/shared/preferences/history.svg => browser/themes/shared/incontentprefs/history.svg
rename : browser/themes/shared/preferences/no-search-bar.svg => browser/themes/shared/incontentprefs/no-search-bar.svg
rename : browser/themes/shared/preferences/no-search-results.svg => browser/themes/shared/incontentprefs/no-search-results.svg
rename : browser/themes/shared/preferences/preferences.inc.css => browser/themes/shared/incontentprefs/preferences.inc.css
rename : browser/themes/shared/preferences/preferences.svg => browser/themes/shared/incontentprefs/preferences.svg
rename : browser/themes/shared/preferences/privacy-security.svg => browser/themes/shared/incontentprefs/privacy-security.svg
rename : browser/themes/shared/preferences/privacy.css => browser/themes/shared/incontentprefs/privacy.css
rename : browser/themes/shared/preferences/search-arrow-indicator.svg => browser/themes/shared/incontentprefs/search-arrow-indicator.svg
rename : browser/themes/shared/preferences/search-bar.svg => browser/themes/shared/incontentprefs/search-bar.svg
rename : browser/themes/shared/preferences/search.css => browser/themes/shared/incontentprefs/search.css
rename : browser/themes/shared/preferences/search.svg => browser/themes/shared/incontentprefs/search.svg
rename : browser/themes/shared/preferences/siteDataSettings.css => browser/themes/shared/incontentprefs/siteDataSettings.css
rename : browser/themes/shared/preferences/sync.svg => browser/themes/shared/incontentprefs/sync.svg
rename : browser/themes/shared/preferences/tab.svg => browser/themes/shared/incontentprefs/tab.svg
rename : browser/themes/shared/preferences/containers-dialog.css => browser/themes/shared/preferences/containers.css