fixed wrong casing in icon name "textEditor" => "text-editor"

- also, the icon import statements in iconimports.ts are now generated in alphabetical order

buildutils/src/ensure-package.ts

@@ -391,8 +391,10 @@ export async function ensureUiComponents(
       );
     }
   });
-  const svgImportStatements = _svgImportStatements.join('\n');
-  const labiconConstructions = _labiconConstructions.join('\n');
+
+  // sort the statements and then join them
+  const svgImportStatements = _svgImportStatements.sort().join('\n');
+  const labiconConstructions = _labiconConstructions.sort().join('\n');
 
   // generate the actual contents of the iconImports file
   const iconImportsPath = path.join(iconSrcDir, 'iconimports.ts');
@@ -423,8 +425,10 @@ export async function ensureUiComponents(
       `.${className} {background-image: var(--${urlName})}`
     );
   });
-  const iconCSSUrls = _iconCSSUrls.join('\n');
-  const iconCSSDeclarations = _iconCSSDeclarations.join('\n');
+
+  // sort the statements and then join them
+  const iconCSSUrls = _iconCSSUrls.sort().join('\n');
+  const iconCSSDeclarations = _iconCSSDeclarations.sort().join('\n');
 
   // generate the actual contents of the iconCSSClasses file
   const iconCSSClassesPath = path.join(iconCSSDir, 'deprecated.css');

packages/codemirror-extension/schema/commands.json

@@ -1,5 +1,5 @@
 {
-  "jupyter.lab.setting-icon": "ui-components:textEditor",
+  "jupyter.lab.setting-icon": "ui-components:text-editor",
   "jupyter.lab.setting-icon-label": "CodeMirror",
   "title": "CodeMirror",
   "description": "Text editor settings for all CodeMirror editors.",

packages/fileeditor-extension/schema/plugin.json

@@ -1,5 +1,5 @@
 {
-  "jupyter.lab.setting-icon": "ui-components:textEditor",
+  "jupyter.lab.setting-icon": "ui-components:text-editor",
   "jupyter.lab.setting-icon-label": "Editor",
   "title": "Text Editor",
   "description": "Text editor settings.",

packages/ui-components/src/icon/iconimports.ts

@@ -8,133 +8,133 @@
 import { LabIcon } from './labicon';
 
 // icon svg import statements
-import caretDownEmptyThinSvgstr from '../../style/icons/arrow/caret-down-empty-thin.svg';
+import addSvgstr from '../../style/icons/toolbar/add.svg';
+import bugSvgstr from '../../style/icons/toolbar/bug.svg';
+import buildSvgstr from '../../style/icons/sidebar/build.svg';
 import caretDownEmptySvgstr from '../../style/icons/arrow/caret-down-empty.svg';
+import caretDownEmptyThinSvgstr from '../../style/icons/arrow/caret-down-empty-thin.svg';
 import caretDownSvgstr from '../../style/icons/arrow/caret-down.svg';
 import caretLeftSvgstr from '../../style/icons/arrow/caret-left.svg';
 import caretRightSvgstr from '../../style/icons/arrow/caret-right.svg';
 import caretUpEmptyThinSvgstr from '../../style/icons/arrow/caret-up-empty-thin.svg';
 import caretUpSvgstr from '../../style/icons/arrow/caret-up.svg';
-import consoleSvgstr from '../../style/icons/filetype/console.svg';
-import fileSvgstr from '../../style/icons/filetype/file.svg';
-import folderSvgstr from '../../style/icons/filetype/folder.svg';
-import html5Svgstr from '../../style/icons/filetype/html5.svg';
-import imageSvgstr from '../../style/icons/filetype/image.svg';
-import inspectorSvgstr from '../../style/icons/filetype/inspector.svg';
-import jsonSvgstr from '../../style/icons/filetype/json.svg';
-import keyboardSvgstr from '../../style/icons/filetype/keyboard.svg';
-import launcherSvgstr from '../../style/icons/filetype/launcher.svg';
-import markdownSvgstr from '../../style/icons/filetype/markdown.svg';
-import notebookSvgstr from '../../style/icons/filetype/notebook.svg';
-import pythonSvgstr from '../../style/icons/filetype/python.svg';
-import rKernelSvgstr from '../../style/icons/filetype/r-kernel.svg';
-import reactSvgstr from '../../style/icons/filetype/react.svg';
-import settingsSvgstr from '../../style/icons/filetype/settings.svg';
-import spreadsheetSvgstr from '../../style/icons/filetype/spreadsheet.svg';
-import textEditorSvgstr from '../../style/icons/filetype/text-editor.svg';
-import vegaSvgstr from '../../style/icons/filetype/vega.svg';
-import yamlSvgstr from '../../style/icons/filetype/yaml.svg';
-import jupyterFaviconSvgstr from '../../style/icons/jupyter/jupyter-favicon.svg';
-import jupyterSvgstr from '../../style/icons/jupyter/jupyter.svg';
-import jupyterlabWordmarkSvgstr from '../../style/icons/jupyter/jupyterlab-wordmark.svg';
 import caseSensitiveSvgstr from '../../style/icons/search/case-sensitive.svg';
-import regexSvgstr from '../../style/icons/search/regex.svg';
-import buildSvgstr from '../../style/icons/sidebar/build.svg';
-import extensionSvgstr from '../../style/icons/sidebar/extension.svg';
-import paletteSvgstr from '../../style/icons/sidebar/palette.svg';
-import runningSvgstr from '../../style/icons/sidebar/running.svg';
-import tabSvgstr from '../../style/icons/sidebar/tab.svg';
-import kernelSvgstr from '../../style/icons/statusbar/kernel.svg';
-import lineFormSvgstr from '../../style/icons/statusbar/line-form.svg';
-import listSvgstr from '../../style/icons/statusbar/list.svg';
-import notTrustedSvgstr from '../../style/icons/statusbar/not-trusted.svg';
-import terminalSvgstr from '../../style/icons/statusbar/terminal.svg';
-import trustedSvgstr from '../../style/icons/statusbar/trusted.svg';
-import addSvgstr from '../../style/icons/toolbar/add.svg';
-import bugSvgstr from '../../style/icons/toolbar/bug.svg';
 import checkSvgstr from '../../style/icons/toolbar/check.svg';
 import circleEmptySvgstr from '../../style/icons/toolbar/circle-empty.svg';
 import circleSvgstr from '../../style/icons/toolbar/circle.svg';
 import closeSvgstr from '../../style/icons/toolbar/close.svg';
+import consoleSvgstr from '../../style/icons/filetype/console.svg';
 import copySvgstr from '../../style/icons/toolbar/copy.svg';
 import cutSvgstr from '../../style/icons/toolbar/cut.svg';
 import downloadSvgstr from '../../style/icons/toolbar/download.svg';
 import editSvgstr from '../../style/icons/toolbar/edit.svg';
 import ellipsesSvgstr from '../../style/icons/toolbar/ellipses.svg';
+import extensionSvgstr from '../../style/icons/sidebar/extension.svg';
+import fileSvgstr from '../../style/icons/filetype/file.svg';
 import fileUploadSvgstr from '../../style/icons/toolbar/file-upload.svg';
 import filterListSvgstr from '../../style/icons/toolbar/filter-list.svg';
+import folderSvgstr from '../../style/icons/filetype/folder.svg';
+import html5Svgstr from '../../style/icons/filetype/html5.svg';
+import imageSvgstr from '../../style/icons/filetype/image.svg';
+import inspectorSvgstr from '../../style/icons/filetype/inspector.svg';
+import jsonSvgstr from '../../style/icons/filetype/json.svg';
+import jupyterFaviconSvgstr from '../../style/icons/jupyter/jupyter-favicon.svg';
+import jupyterSvgstr from '../../style/icons/jupyter/jupyter.svg';
+import jupyterlabWordmarkSvgstr from '../../style/icons/jupyter/jupyterlab-wordmark.svg';
+import kernelSvgstr from '../../style/icons/statusbar/kernel.svg';
+import keyboardSvgstr from '../../style/icons/filetype/keyboard.svg';
+import launcherSvgstr from '../../style/icons/filetype/launcher.svg';
+import lineFormSvgstr from '../../style/icons/statusbar/line-form.svg';
 import linkSvgstr from '../../style/icons/toolbar/link.svg';
+import listSvgstr from '../../style/icons/statusbar/list.svg';
+import markdownSvgstr from '../../style/icons/filetype/markdown.svg';
 import newFolderSvgstr from '../../style/icons/toolbar/new-folder.svg';
+import notTrustedSvgstr from '../../style/icons/statusbar/not-trusted.svg';
+import notebookSvgstr from '../../style/icons/filetype/notebook.svg';
+import paletteSvgstr from '../../style/icons/sidebar/palette.svg';
 import pasteSvgstr from '../../style/icons/toolbar/paste.svg';
+import pythonSvgstr from '../../style/icons/filetype/python.svg';
+import rKernelSvgstr from '../../style/icons/filetype/r-kernel.svg';
+import reactSvgstr from '../../style/icons/filetype/react.svg';
 import refreshSvgstr from '../../style/icons/toolbar/refresh.svg';
+import regexSvgstr from '../../style/icons/search/regex.svg';
 import runSvgstr from '../../style/icons/toolbar/run.svg';
+import runningSvgstr from '../../style/icons/sidebar/running.svg';
 import saveSvgstr from '../../style/icons/toolbar/save.svg';
 import searchSvgstr from '../../style/icons/toolbar/search.svg';
+import settingsSvgstr from '../../style/icons/filetype/settings.svg';
+import spreadsheetSvgstr from '../../style/icons/filetype/spreadsheet.svg';
 import stopSvgstr from '../../style/icons/toolbar/stop.svg';
+import tabSvgstr from '../../style/icons/sidebar/tab.svg';
+import terminalSvgstr from '../../style/icons/statusbar/terminal.svg';
+import textEditorSvgstr from '../../style/icons/filetype/text-editor.svg';
+import trustedSvgstr from '../../style/icons/statusbar/trusted.svg';
 import undoSvgstr from '../../style/icons/toolbar/undo.svg';
+import vegaSvgstr from '../../style/icons/filetype/vega.svg';
+import yamlSvgstr from '../../style/icons/filetype/yaml.svg';
 
 // LabIcon instance construction
-export const caretDownEmptyThinIcon = new LabIcon({ name: 'ui-components:caret-down-empty-thin', svgstr: caretDownEmptyThinSvgstr });
+export const addIcon = new LabIcon({ name: 'ui-components:add', svgstr: addSvgstr });
+export const bugIcon = new LabIcon({ name: 'ui-components:bug', svgstr: bugSvgstr });
+export const buildIcon = new LabIcon({ name: 'ui-components:build', svgstr: buildSvgstr });
 export const caretDownEmptyIcon = new LabIcon({ name: 'ui-components:caret-down-empty', svgstr: caretDownEmptySvgstr });
+export const caretDownEmptyThinIcon = new LabIcon({ name: 'ui-components:caret-down-empty-thin', svgstr: caretDownEmptyThinSvgstr });
 export const caretDownIcon = new LabIcon({ name: 'ui-components:caret-down', svgstr: caretDownSvgstr });
 export const caretLeftIcon = new LabIcon({ name: 'ui-components:caret-left', svgstr: caretLeftSvgstr });
 export const caretRightIcon = new LabIcon({ name: 'ui-components:caret-right', svgstr: caretRightSvgstr });
 export const caretUpEmptyThinIcon = new LabIcon({ name: 'ui-components:caret-up-empty-thin', svgstr: caretUpEmptyThinSvgstr });
 export const caretUpIcon = new LabIcon({ name: 'ui-components:caret-up', svgstr: caretUpSvgstr });
-export const consoleIcon = new LabIcon({ name: 'ui-components:console', svgstr: consoleSvgstr });
-export const fileIcon = new LabIcon({ name: 'ui-components:file', svgstr: fileSvgstr });
-export const folderIcon = new LabIcon({ name: 'ui-components:folder', svgstr: folderSvgstr });
-export const html5Icon = new LabIcon({ name: 'ui-components:html5', svgstr: html5Svgstr });
-export const imageIcon = new LabIcon({ name: 'ui-components:image', svgstr: imageSvgstr });
-export const inspectorIcon = new LabIcon({ name: 'ui-components:inspector', svgstr: inspectorSvgstr });
-export const jsonIcon = new LabIcon({ name: 'ui-components:json', svgstr: jsonSvgstr });
-export const keyboardIcon = new LabIcon({ name: 'ui-components:keyboard', svgstr: keyboardSvgstr });
-export const launcherIcon = new LabIcon({ name: 'ui-components:launcher', svgstr: launcherSvgstr });
-export const markdownIcon = new LabIcon({ name: 'ui-components:markdown', svgstr: markdownSvgstr });
-export const notebookIcon = new LabIcon({ name: 'ui-components:notebook', svgstr: notebookSvgstr });
-export const pythonIcon = new LabIcon({ name: 'ui-components:python', svgstr: pythonSvgstr });
-export const rKernelIcon = new LabIcon({ name: 'ui-components:r-kernel', svgstr: rKernelSvgstr });
-export const reactIcon = new LabIcon({ name: 'ui-components:react', svgstr: reactSvgstr });
-export const settingsIcon = new LabIcon({ name: 'ui-components:settings', svgstr: settingsSvgstr });
-export const spreadsheetIcon = new LabIcon({ name: 'ui-components:spreadsheet', svgstr: spreadsheetSvgstr });
-export const textEditorIcon = new LabIcon({ name: 'ui-components:text-editor', svgstr: textEditorSvgstr });
-export const vegaIcon = new LabIcon({ name: 'ui-components:vega', svgstr: vegaSvgstr });
-export const yamlIcon = new LabIcon({ name: 'ui-components:yaml', svgstr: yamlSvgstr });
-export const jupyterFaviconIcon = new LabIcon({ name: 'ui-components:jupyter-favicon', svgstr: jupyterFaviconSvgstr });
-export const jupyterIcon = new LabIcon({ name: 'ui-components:jupyter', svgstr: jupyterSvgstr });
-export const jupyterlabWordmarkIcon = new LabIcon({ name: 'ui-components:jupyterlab-wordmark', svgstr: jupyterlabWordmarkSvgstr });
 export const caseSensitiveIcon = new LabIcon({ name: 'ui-components:case-sensitive', svgstr: caseSensitiveSvgstr });
-export const regexIcon = new LabIcon({ name: 'ui-components:regex', svgstr: regexSvgstr });
-export const buildIcon = new LabIcon({ name: 'ui-components:build', svgstr: buildSvgstr });
-export const extensionIcon = new LabIcon({ name: 'ui-components:extension', svgstr: extensionSvgstr });
-export const paletteIcon = new LabIcon({ name: 'ui-components:palette', svgstr: paletteSvgstr });
-export const runningIcon = new LabIcon({ name: 'ui-components:running', svgstr: runningSvgstr });
-export const tabIcon = new LabIcon({ name: 'ui-components:tab', svgstr: tabSvgstr });
-export const kernelIcon = new LabIcon({ name: 'ui-components:kernel', svgstr: kernelSvgstr });
-export const lineFormIcon = new LabIcon({ name: 'ui-components:line-form', svgstr: lineFormSvgstr });
-export const listIcon = new LabIcon({ name: 'ui-components:list', svgstr: listSvgstr });
-export const notTrustedIcon = new LabIcon({ name: 'ui-components:not-trusted', svgstr: notTrustedSvgstr });
-export const terminalIcon = new LabIcon({ name: 'ui-components:terminal', svgstr: terminalSvgstr });
-export const trustedIcon = new LabIcon({ name: 'ui-components:trusted', svgstr: trustedSvgstr });
-export const addIcon = new LabIcon({ name: 'ui-components:add', svgstr: addSvgstr });
-export const bugIcon = new LabIcon({ name: 'ui-components:bug', svgstr: bugSvgstr });
 export const checkIcon = new LabIcon({ name: 'ui-components:check', svgstr: checkSvgstr });
 export const circleEmptyIcon = new LabIcon({ name: 'ui-components:circle-empty', svgstr: circleEmptySvgstr });
 export const circleIcon = new LabIcon({ name: 'ui-components:circle', svgstr: circleSvgstr });
 export const closeIcon = new LabIcon({ name: 'ui-components:close', svgstr: closeSvgstr });
+export const consoleIcon = new LabIcon({ name: 'ui-components:console', svgstr: consoleSvgstr });
 export const copyIcon = new LabIcon({ name: 'ui-components:copy', svgstr: copySvgstr });
 export const cutIcon = new LabIcon({ name: 'ui-components:cut', svgstr: cutSvgstr });
 export const downloadIcon = new LabIcon({ name: 'ui-components:download', svgstr: downloadSvgstr });
 export const editIcon = new LabIcon({ name: 'ui-components:edit', svgstr: editSvgstr });
 export const ellipsesIcon = new LabIcon({ name: 'ui-components:ellipses', svgstr: ellipsesSvgstr });
+export const extensionIcon = new LabIcon({ name: 'ui-components:extension', svgstr: extensionSvgstr });
+export const fileIcon = new LabIcon({ name: 'ui-components:file', svgstr: fileSvgstr });
 export const fileUploadIcon = new LabIcon({ name: 'ui-components:file-upload', svgstr: fileUploadSvgstr });
 export const filterListIcon = new LabIcon({ name: 'ui-components:filter-list', svgstr: filterListSvgstr });
+export const folderIcon = new LabIcon({ name: 'ui-components:folder', svgstr: folderSvgstr });
+export const html5Icon = new LabIcon({ name: 'ui-components:html5', svgstr: html5Svgstr });
+export const imageIcon = new LabIcon({ name: 'ui-components:image', svgstr: imageSvgstr });
+export const inspectorIcon = new LabIcon({ name: 'ui-components:inspector', svgstr: inspectorSvgstr });
+export const jsonIcon = new LabIcon({ name: 'ui-components:json', svgstr: jsonSvgstr });
+export const jupyterFaviconIcon = new LabIcon({ name: 'ui-components:jupyter-favicon', svgstr: jupyterFaviconSvgstr });
+export const jupyterIcon = new LabIcon({ name: 'ui-components:jupyter', svgstr: jupyterSvgstr });
+export const jupyterlabWordmarkIcon = new LabIcon({ name: 'ui-components:jupyterlab-wordmark', svgstr: jupyterlabWordmarkSvgstr });
+export const kernelIcon = new LabIcon({ name: 'ui-components:kernel', svgstr: kernelSvgstr });
+export const keyboardIcon = new LabIcon({ name: 'ui-components:keyboard', svgstr: keyboardSvgstr });
+export const launcherIcon = new LabIcon({ name: 'ui-components:launcher', svgstr: launcherSvgstr });
+export const lineFormIcon = new LabIcon({ name: 'ui-components:line-form', svgstr: lineFormSvgstr });
 export const linkIcon = new LabIcon({ name: 'ui-components:link', svgstr: linkSvgstr });
+export const listIcon = new LabIcon({ name: 'ui-components:list', svgstr: listSvgstr });
+export const markdownIcon = new LabIcon({ name: 'ui-components:markdown', svgstr: markdownSvgstr });
 export const newFolderIcon = new LabIcon({ name: 'ui-components:new-folder', svgstr: newFolderSvgstr });
+export const notTrustedIcon = new LabIcon({ name: 'ui-components:not-trusted', svgstr: notTrustedSvgstr });
+export const notebookIcon = new LabIcon({ name: 'ui-components:notebook', svgstr: notebookSvgstr });
+export const paletteIcon = new LabIcon({ name: 'ui-components:palette', svgstr: paletteSvgstr });
 export const pasteIcon = new LabIcon({ name: 'ui-components:paste', svgstr: pasteSvgstr });
+export const pythonIcon = new LabIcon({ name: 'ui-components:python', svgstr: pythonSvgstr });
+export const rKernelIcon = new LabIcon({ name: 'ui-components:r-kernel', svgstr: rKernelSvgstr });
+export const reactIcon = new LabIcon({ name: 'ui-components:react', svgstr: reactSvgstr });
 export const refreshIcon = new LabIcon({ name: 'ui-components:refresh', svgstr: refreshSvgstr });
+export const regexIcon = new LabIcon({ name: 'ui-components:regex', svgstr: regexSvgstr });
 export const runIcon = new LabIcon({ name: 'ui-components:run', svgstr: runSvgstr });
+export const runningIcon = new LabIcon({ name: 'ui-components:running', svgstr: runningSvgstr });
 export const saveIcon = new LabIcon({ name: 'ui-components:save', svgstr: saveSvgstr });
 export const searchIcon = new LabIcon({ name: 'ui-components:search', svgstr: searchSvgstr });
+export const settingsIcon = new LabIcon({ name: 'ui-components:settings', svgstr: settingsSvgstr });
+export const spreadsheetIcon = new LabIcon({ name: 'ui-components:spreadsheet', svgstr: spreadsheetSvgstr });
 export const stopIcon = new LabIcon({ name: 'ui-components:stop', svgstr: stopSvgstr });
+export const tabIcon = new LabIcon({ name: 'ui-components:tab', svgstr: tabSvgstr });
+export const terminalIcon = new LabIcon({ name: 'ui-components:terminal', svgstr: terminalSvgstr });
+export const textEditorIcon = new LabIcon({ name: 'ui-components:text-editor', svgstr: textEditorSvgstr });
+export const trustedIcon = new LabIcon({ name: 'ui-components:trusted', svgstr: trustedSvgstr });
 export const undoIcon = new LabIcon({ name: 'ui-components:undo', svgstr: undoSvgstr });
+export const vegaIcon = new LabIcon({ name: 'ui-components:vega', svgstr: vegaSvgstr });
+export const yamlIcon = new LabIcon({ name: 'ui-components:yaml', svgstr: yamlSvgstr });

packages/ui-components/style/deprecated.css

@@ -12,6 +12,9 @@
 /* Icons urls */
 
 :root {
+  --jp-icon-add: url('icons/toolbar/add.svg');
+  --jp-icon-bug: url('icons/toolbar/bug.svg');
+  --jp-icon-build: url('icons/sidebar/build.svg');
   --jp-icon-caret-down-empty-thin: url('icons/arrow/caret-down-empty-thin.svg');
   --jp-icon-caret-down-empty: url('icons/arrow/caret-down-empty.svg');
   --jp-icon-caret-down: url('icons/arrow/caret-down.svg');
@@ -19,73 +22,79 @@
   --jp-icon-caret-right: url('icons/arrow/caret-right.svg');
   --jp-icon-caret-up-empty-thin: url('icons/arrow/caret-up-empty-thin.svg');
   --jp-icon-caret-up: url('icons/arrow/caret-up.svg');
-  --jp-icon-console: url('icons/filetype/console.svg');
-  --jp-icon-file: url('icons/filetype/file.svg');
-  --jp-icon-folder: url('icons/filetype/folder.svg');
-  --jp-icon-html5: url('icons/filetype/html5.svg');
-  --jp-icon-image: url('icons/filetype/image.svg');
-  --jp-icon-inspector: url('icons/filetype/inspector.svg');
-  --jp-icon-json: url('icons/filetype/json.svg');
-  --jp-icon-keyboard: url('icons/filetype/keyboard.svg');
-  --jp-icon-launcher: url('icons/filetype/launcher.svg');
-  --jp-icon-markdown: url('icons/filetype/markdown.svg');
-  --jp-icon-notebook: url('icons/filetype/notebook.svg');
-  --jp-icon-python: url('icons/filetype/python.svg');
-  --jp-icon-r-kernel: url('icons/filetype/r-kernel.svg');
-  --jp-icon-react: url('icons/filetype/react.svg');
-  --jp-icon-settings: url('icons/filetype/settings.svg');
-  --jp-icon-spreadsheet: url('icons/filetype/spreadsheet.svg');
-  --jp-icon-text-editor: url('icons/filetype/text-editor.svg');
-  --jp-icon-vega: url('icons/filetype/vega.svg');
-  --jp-icon-yaml: url('icons/filetype/yaml.svg');
-  --jp-icon-jupyter-favicon: url('icons/jupyter/jupyter-favicon.svg');
-  --jp-icon-jupyter: url('icons/jupyter/jupyter.svg');
-  --jp-icon-jupyterlab-wordmark: url('icons/jupyter/jupyterlab-wordmark.svg');
   --jp-icon-case-sensitive: url('icons/search/case-sensitive.svg');
-  --jp-icon-regex: url('icons/search/regex.svg');
-  --jp-icon-build: url('icons/sidebar/build.svg');
-  --jp-icon-extension: url('icons/sidebar/extension.svg');
-  --jp-icon-palette: url('icons/sidebar/palette.svg');
-  --jp-icon-running: url('icons/sidebar/running.svg');
-  --jp-icon-tab: url('icons/sidebar/tab.svg');
-  --jp-icon-kernel: url('icons/statusbar/kernel.svg');
-  --jp-icon-line-form: url('icons/statusbar/line-form.svg');
-  --jp-icon-list: url('icons/statusbar/list.svg');
-  --jp-icon-not-trusted: url('icons/statusbar/not-trusted.svg');
-  --jp-icon-terminal: url('icons/statusbar/terminal.svg');
-  --jp-icon-trusted: url('icons/statusbar/trusted.svg');
-  --jp-icon-add: url('icons/toolbar/add.svg');
-  --jp-icon-bug: url('icons/toolbar/bug.svg');
   --jp-icon-check: url('icons/toolbar/check.svg');
   --jp-icon-circle-empty: url('icons/toolbar/circle-empty.svg');
   --jp-icon-circle: url('icons/toolbar/circle.svg');
   --jp-icon-close: url('icons/toolbar/close.svg');
+  --jp-icon-console: url('icons/filetype/console.svg');
   --jp-icon-copy: url('icons/toolbar/copy.svg');
   --jp-icon-cut: url('icons/toolbar/cut.svg');
   --jp-icon-download: url('icons/toolbar/download.svg');
   --jp-icon-edit: url('icons/toolbar/edit.svg');
   --jp-icon-ellipses: url('icons/toolbar/ellipses.svg');
+  --jp-icon-extension: url('icons/sidebar/extension.svg');
   --jp-icon-file-upload: url('icons/toolbar/file-upload.svg');
+  --jp-icon-file: url('icons/filetype/file.svg');
   --jp-icon-filter-list: url('icons/toolbar/filter-list.svg');
+  --jp-icon-folder: url('icons/filetype/folder.svg');
+  --jp-icon-html5: url('icons/filetype/html5.svg');
+  --jp-icon-image: url('icons/filetype/image.svg');
+  --jp-icon-inspector: url('icons/filetype/inspector.svg');
+  --jp-icon-json: url('icons/filetype/json.svg');
+  --jp-icon-jupyter-favicon: url('icons/jupyter/jupyter-favicon.svg');
+  --jp-icon-jupyter: url('icons/jupyter/jupyter.svg');
+  --jp-icon-jupyterlab-wordmark: url('icons/jupyter/jupyterlab-wordmark.svg');
+  --jp-icon-kernel: url('icons/statusbar/kernel.svg');
+  --jp-icon-keyboard: url('icons/filetype/keyboard.svg');
+  --jp-icon-launcher: url('icons/filetype/launcher.svg');
+  --jp-icon-line-form: url('icons/statusbar/line-form.svg');
   --jp-icon-link: url('icons/toolbar/link.svg');
+  --jp-icon-list: url('icons/statusbar/list.svg');
+  --jp-icon-markdown: url('icons/filetype/markdown.svg');
   --jp-icon-new-folder: url('icons/toolbar/new-folder.svg');
+  --jp-icon-not-trusted: url('icons/statusbar/not-trusted.svg');
+  --jp-icon-notebook: url('icons/filetype/notebook.svg');
+  --jp-icon-palette: url('icons/sidebar/palette.svg');
   --jp-icon-paste: url('icons/toolbar/paste.svg');
+  --jp-icon-python: url('icons/filetype/python.svg');
+  --jp-icon-r-kernel: url('icons/filetype/r-kernel.svg');
+  --jp-icon-react: url('icons/filetype/react.svg');
   --jp-icon-refresh: url('icons/toolbar/refresh.svg');
+  --jp-icon-regex: url('icons/search/regex.svg');
   --jp-icon-run: url('icons/toolbar/run.svg');
+  --jp-icon-running: url('icons/sidebar/running.svg');
   --jp-icon-save: url('icons/toolbar/save.svg');
   --jp-icon-search: url('icons/toolbar/search.svg');
+  --jp-icon-settings: url('icons/filetype/settings.svg');
+  --jp-icon-spreadsheet: url('icons/filetype/spreadsheet.svg');
   --jp-icon-stop: url('icons/toolbar/stop.svg');
+  --jp-icon-tab: url('icons/sidebar/tab.svg');
+  --jp-icon-terminal: url('icons/statusbar/terminal.svg');
+  --jp-icon-text-editor: url('icons/filetype/text-editor.svg');
+  --jp-icon-trusted: url('icons/statusbar/trusted.svg');
   --jp-icon-undo: url('icons/toolbar/undo.svg');
+  --jp-icon-vega: url('icons/filetype/vega.svg');
+  --jp-icon-yaml: url('icons/filetype/yaml.svg');
 }
 
 /* Icon CSS class declarations */
 
-.jp-CaretDownEmptyThinIcon {
-  background-image: var(--jp-icon-caret-down-empty-thin);
+.jp-AddIcon {
+  background-image: var(--jp-icon-add);
+}
+.jp-BugIcon {
+  background-image: var(--jp-icon-bug);
+}
+.jp-BuildIcon {
+  background-image: var(--jp-icon-build);
 }
 .jp-CaretDownEmptyIcon {
   background-image: var(--jp-icon-caret-down-empty);
 }
+.jp-CaretDownEmptyThinIcon {
+  background-image: var(--jp-icon-caret-down-empty-thin);
+}
 .jp-CaretDownIcon {
   background-image: var(--jp-icon-caret-down);
 }
@@ -101,12 +110,51 @@
 .jp-CaretUpIcon {
   background-image: var(--jp-icon-caret-up);
 }
+.jp-CaseSensitiveIcon {
+  background-image: var(--jp-icon-case-sensitive);
+}
+.jp-CheckIcon {
+  background-image: var(--jp-icon-check);
+}
+.jp-CircleEmptyIcon {
+  background-image: var(--jp-icon-circle-empty);
+}
+.jp-CircleIcon {
+  background-image: var(--jp-icon-circle);
+}
+.jp-CloseIcon {
+  background-image: var(--jp-icon-close);
+}
 .jp-ConsoleIcon {
   background-image: var(--jp-icon-console);
 }
+.jp-CopyIcon {
+  background-image: var(--jp-icon-copy);
+}
+.jp-CutIcon {
+  background-image: var(--jp-icon-cut);
+}
+.jp-DownloadIcon {
+  background-image: var(--jp-icon-download);
+}
+.jp-EditIcon {
+  background-image: var(--jp-icon-edit);
+}
+.jp-EllipsesIcon {
+  background-image: var(--jp-icon-ellipses);
+}
+.jp-ExtensionIcon {
+  background-image: var(--jp-icon-extension);
+}
 .jp-FileIcon {
   background-image: var(--jp-icon-file);
 }
+.jp-FileUploadIcon {
+  background-image: var(--jp-icon-file-upload);
+}
+.jp-FilterListIcon {
+  background-image: var(--jp-icon-filter-list);
+}
 .jp-FolderIcon {
   background-image: var(--jp-icon-folder);
 }
@@ -122,42 +170,6 @@
 .jp-JsonIcon {
   background-image: var(--jp-icon-json);
 }
-.jp-KeyboardIcon {
-  background-image: var(--jp-icon-keyboard);
-}
-.jp-LauncherIcon {
-  background-image: var(--jp-icon-launcher);
-}
-.jp-MarkdownIcon {
-  background-image: var(--jp-icon-markdown);
-}
-.jp-NotebookIcon {
-  background-image: var(--jp-icon-notebook);
-}
-.jp-PythonIcon {
-  background-image: var(--jp-icon-python);
-}
-.jp-RKernelIcon {
-  background-image: var(--jp-icon-r-kernel);
-}
-.jp-ReactIcon {
-  background-image: var(--jp-icon-react);
-}
-.jp-SettingsIcon {
-  background-image: var(--jp-icon-settings);
-}
-.jp-SpreadsheetIcon {
-  background-image: var(--jp-icon-spreadsheet);
-}
-.jp-TextEditorIcon {
-  background-image: var(--jp-icon-text-editor);
-}
-.jp-VegaIcon {
-  background-image: var(--jp-icon-vega);
-}
-.jp-YamlIcon {
-  background-image: var(--jp-icon-yaml);
-}
 .jp-JupyterFaviconIcon {
   background-image: var(--jp-icon-jupyter-favicon);
 }
@@ -167,108 +179,96 @@
 .jp-JupyterlabWordmarkIcon {
   background-image: var(--jp-icon-jupyterlab-wordmark);
 }
-.jp-CaseSensitiveIcon {
-  background-image: var(--jp-icon-case-sensitive);
-}
-.jp-RegexIcon {
-  background-image: var(--jp-icon-regex);
-}
-.jp-BuildIcon {
-  background-image: var(--jp-icon-build);
-}
-.jp-ExtensionIcon {
-  background-image: var(--jp-icon-extension);
-}
-.jp-PaletteIcon {
-  background-image: var(--jp-icon-palette);
-}
-.jp-RunningIcon {
-  background-image: var(--jp-icon-running);
-}
-.jp-TabIcon {
-  background-image: var(--jp-icon-tab);
-}
 .jp-KernelIcon {
   background-image: var(--jp-icon-kernel);
 }
+.jp-KeyboardIcon {
+  background-image: var(--jp-icon-keyboard);
+}
+.jp-LauncherIcon {
+  background-image: var(--jp-icon-launcher);
+}
 .jp-LineFormIcon {
   background-image: var(--jp-icon-line-form);
 }
+.jp-LinkIcon {
+  background-image: var(--jp-icon-link);
+}
 .jp-ListIcon {
   background-image: var(--jp-icon-list);
 }
-.jp-NotTrustedIcon {
-  background-image: var(--jp-icon-not-trusted);
-}
-.jp-TerminalIcon {
-  background-image: var(--jp-icon-terminal);
-}
-.jp-TrustedIcon {
-  background-image: var(--jp-icon-trusted);
-}
-.jp-AddIcon {
-  background-image: var(--jp-icon-add);
-}
-.jp-BugIcon {
-  background-image: var(--jp-icon-bug);
-}
-.jp-CheckIcon {
-  background-image: var(--jp-icon-check);
-}
-.jp-CircleEmptyIcon {
-  background-image: var(--jp-icon-circle-empty);
-}
-.jp-CircleIcon {
-  background-image: var(--jp-icon-circle);
-}
-.jp-CloseIcon {
-  background-image: var(--jp-icon-close);
-}
-.jp-CopyIcon {
-  background-image: var(--jp-icon-copy);
-}
-.jp-CutIcon {
-  background-image: var(--jp-icon-cut);
+.jp-MarkdownIcon {
+  background-image: var(--jp-icon-markdown);
 }
-.jp-DownloadIcon {
-  background-image: var(--jp-icon-download);
+.jp-NewFolderIcon {
+  background-image: var(--jp-icon-new-folder);
 }
-.jp-EditIcon {
-  background-image: var(--jp-icon-edit);
+.jp-NotTrustedIcon {
+  background-image: var(--jp-icon-not-trusted);
 }
-.jp-EllipsesIcon {
-  background-image: var(--jp-icon-ellipses);
+.jp-NotebookIcon {
+  background-image: var(--jp-icon-notebook);
 }
-.jp-FileUploadIcon {
-  background-image: var(--jp-icon-file-upload);
+.jp-PaletteIcon {
+  background-image: var(--jp-icon-palette);
 }
-.jp-FilterListIcon {
-  background-image: var(--jp-icon-filter-list);
+.jp-PasteIcon {
+  background-image: var(--jp-icon-paste);
 }
-.jp-LinkIcon {
-  background-image: var(--jp-icon-link);
+.jp-PythonIcon {
+  background-image: var(--jp-icon-python);
 }
-.jp-NewFolderIcon {
-  background-image: var(--jp-icon-new-folder);
+.jp-RKernelIcon {
+  background-image: var(--jp-icon-r-kernel);
 }
-.jp-PasteIcon {
-  background-image: var(--jp-icon-paste);
+.jp-ReactIcon {
+  background-image: var(--jp-icon-react);
 }
 .jp-RefreshIcon {
   background-image: var(--jp-icon-refresh);
 }
+.jp-RegexIcon {
+  background-image: var(--jp-icon-regex);
+}
 .jp-RunIcon {
   background-image: var(--jp-icon-run);
 }
+.jp-RunningIcon {
+  background-image: var(--jp-icon-running);
+}
 .jp-SaveIcon {
   background-image: var(--jp-icon-save);
 }
 .jp-SearchIcon {
   background-image: var(--jp-icon-search);
 }
+.jp-SettingsIcon {
+  background-image: var(--jp-icon-settings);
+}
+.jp-SpreadsheetIcon {
+  background-image: var(--jp-icon-spreadsheet);
+}
 .jp-StopIcon {
   background-image: var(--jp-icon-stop);
 }
+.jp-TabIcon {
+  background-image: var(--jp-icon-tab);
+}
+.jp-TerminalIcon {
+  background-image: var(--jp-icon-terminal);
+}
+.jp-TextEditorIcon {
+  background-image: var(--jp-icon-text-editor);
+}
+.jp-TrustedIcon {
+  background-image: var(--jp-icon-trusted);
+}
 .jp-UndoIcon {
   background-image: var(--jp-icon-undo);
 }
+.jp-VegaIcon {
+  background-image: var(--jp-icon-vega);
+}
+.jp-YamlIcon {
+  background-image: var(--jp-icon-yaml);
+}