diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3d3e772a5f4..6a8048827258 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,13 +44,14 @@ a keyboard shortcut or automatically on save.
 ## Submitting a Pull Request Contribution
 
 Generally, an issue should be opened describing a piece of proposed work and the
-issues it solves before a pull request is opened. 
+issues it solves before a pull request is opened.
 
 ### Issue Management
-Opening an issue lets community members participate in the design discussion, 
-makes others aware of work being done, and sets the stage for a fruitful community 
-interaction. A pull request should reference the issue it is addressing. Once the 
-pull request is merged, the issue related to it will also be closed. If there is 
+
+Opening an issue lets community members participate in the design discussion,
+makes others aware of work being done, and sets the stage for a fruitful community
+interaction. A pull request should reference the issue it is addressing. Once the
+pull request is merged, the issue related to it will also be closed. If there is
 additional discussion around implemementation the issue may be re-opened. Once 30 days
 have passed with no additional discussion, the [lock bot](https://github.com/apps/lock) will lock the issue. If
 additional discussion is desired, or if the pull request doesn't fully address the
diff --git a/buildutils/package.json b/buildutils/package.json
index efd55c58e117..eaae3a4f49b5 100644
--- a/buildutils/package.json
+++ b/buildutils/package.json
@@ -49,6 +49,7 @@
     "mini-css-extract-plugin": "~0.6.0",
     "package-json": "^6.3.0",
     "path": "~0.12.7",
+    "prettier": "^1.18.2",
     "semver": "^6.1.0",
     "sort-package-json": "~1.22.1",
     "typescript": "~3.5.1",
@@ -60,6 +61,7 @@
     "@types/inquirer": "^6.0.3",
     "@types/mini-css-extract-plugin": "^0.2.0",
     "@types/node": "^12.0.2",
+    "@types/prettier": "^1.16.4",
     "@types/webpack": "^4.4.32",
     "rimraf": "~2.6.2"
   }
diff --git a/buildutils/src/build.ts b/buildutils/src/build.ts
index 2e14db75aab3..de622b45a756 100644
--- a/buildutils/src/build.ts
+++ b/buildutils/src/build.ts
@@ -183,10 +183,7 @@ export namespace Build {
             },
             {
               test: /\.svg/,
-              use: [
-                { loader: 'svg-url-loader', options: {} },
-                { loader: 'svgo-loader', options: { plugins: [] } }
-              ]
+              use: [{ loader: 'svg-url-loader', options: { encoding: 'none' } }]
             },
             {
               test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
diff --git a/buildutils/src/ensure-package.ts b/buildutils/src/ensure-package.ts
index 1c4e4991b1d6..2e007c8f972f 100644
--- a/buildutils/src/ensure-package.ts
+++ b/buildutils/src/ensure-package.ts
@@ -6,17 +6,48 @@
 import * as fs from 'fs-extra';
 import * as glob from 'glob';
 import * as path from 'path';
+import * as prettier from 'prettier';
 import * as ts from 'typescript';
 import { getDependency } from './get-dependency';
 import * as utils from './utils';
 
-const CSS_HEADER = `
+const HEADER_TEMPLATE = `
 /*-----------------------------------------------------------------------------
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
+/* This file was auto-generated by {{funcName}}() in @jupyterlab/buildutils */
+`;
+
+const ICON_IMPORTS_TEMPLATE = `
+import { Icon } from './interfaces';
+
+// icon svg import statements
+{{iconImportStatements}}
+
+// defaultIcons definition
+export namespace IconImports {
+  export const defaultIcons: ReadonlyArray<Icon.IModel> = [
+    {{iconModelDeclarations}}
+  ];
+}
+`;
+
+const ICON_CSS_CLASSES_TEMPLATE = `
+/**
+ * (DEPRECATED) Support for consuming icons as CSS background images
+ */
+
+/* Icons urls */
+
+:root {
+  {{iconCSSUrls}}
+}
+
+/* Icon CSS class declarations */
+
+{{iconCSSDeclarations}}
 `;
 
 /**
@@ -138,17 +169,20 @@ export async function ensurePackage(
 
   // Template the CSS index file.
   if (cssImports && fs.existsSync(path.join(pkgPath, 'style/base.css'))) {
-    let cssIndex = CSS_HEADER.trim();
+    const funcName = 'ensurePackage';
+    let cssIndexContents = utils.fromTemplate(
+      HEADER_TEMPLATE,
+      { funcName },
+      { end: '' }
+    );
     cssImports.forEach(cssImport => {
-      cssIndex += `\n@import url('~${cssImport}');`;
+      cssIndexContents += `\n@import url('~${cssImport}');`;
     });
-    cssIndex += "\n\n@import url('./base.css');\n";
-    const cssPath = path.join(pkgPath, 'style/index.css');
-    const prev = fs.readFileSync(cssPath, { encoding: 'utf8' });
-    if (prev !== cssIndex) {
-      messages.push(`Updated ./${data.style}`);
-      fs.writeFileSync(cssPath, cssIndex);
-    }
+    cssIndexContents += "\n\n@import url('./base.css');\n";
+
+    // write out cssIndexContents, if needed
+    const cssIndexPath = path.join(pkgPath, 'style/index.css');
+    messages.push(...ensureFile(cssIndexPath, cssIndexContents, false));
   }
 
   // Look for unused packages
@@ -290,6 +324,78 @@ export async function ensurePackage(
   return messages;
 }
 
+/**
+ * An extra ensure function just for the @jupyterlab/ui-components package.
+ * Ensures that the icon svg import statements are synced with the contents
+ * of ui-components/style/icons.
+ *
+ * @param pkgPath - The path to the @jupyterlab/ui-components package.
+ *
+ * @returns A list of changes that were made to ensure the package.
+ */
+export async function ensureUiComponents(pkgPath: string): Promise<string[]> {
+  const funcName = 'ensureUiComponents';
+  let messages: string[] = [];
+
+  const svgs = glob.sync(path.join(pkgPath, 'style/icons', '**/*.svg'));
+
+  /* support for glob import of icon svgs */
+  const iconSrcDir = path.join(pkgPath, 'src/icon');
+
+  // build the per-icon import code
+  let _iconImportStatements: string[] = [];
+  let _iconModelDeclarations: string[] = [];
+  svgs.forEach(svg => {
+    const name = utils.stem(svg);
+    const nameCamel = utils.camelCase(name) + 'Svg';
+    _iconImportStatements.push(
+      `import ${nameCamel} from '${path.relative(iconSrcDir, svg)}';`
+    );
+    _iconModelDeclarations.push(`{ name: '${name}', svg: ${nameCamel} }`);
+  });
+  const iconImportStatements = _iconImportStatements.join('\n');
+  const iconModelDeclarations = _iconModelDeclarations.join(',\n');
+
+  // generate the actual contents of the iconImports file
+  const iconImportsPath = path.join(iconSrcDir, 'iconImports.ts');
+  const iconImportsContents = utils.fromTemplate(
+    HEADER_TEMPLATE + ICON_IMPORTS_TEMPLATE,
+    { funcName, iconImportStatements, iconModelDeclarations }
+  );
+  messages.push(...ensureFile(iconImportsPath, iconImportsContents));
+
+  /* support for deprecated icon CSS classes */
+  const iconCSSDir = path.join(pkgPath, 'style');
+
+  // build the per-icon import code
+  let _iconCSSUrls: string[] = [];
+  let _iconCSSDeclarations: string[] = [];
+  svgs.forEach(svg => {
+    const name = utils.stem(svg);
+    const urlName = 'jp-icon-' + name;
+    const className = 'jp-' + utils.camelCase(name, true) + 'Icon';
+
+    _iconCSSUrls.push(
+      `--${urlName}: url('${path.relative(iconCSSDir, svg)}');`
+    );
+    _iconCSSDeclarations.push(
+      `.${className} {background-image: var(--${urlName})}`
+    );
+  });
+  const iconCSSUrls = _iconCSSUrls.join('\n');
+  const iconCSSDeclarations = _iconCSSDeclarations.join('\n');
+
+  // generate the actual contents of the iconCSSClasses file
+  const iconCSSClassesPath = path.join(iconCSSDir, 'deprecated.css');
+  const iconCSSClassesContent = utils.fromTemplate(
+    HEADER_TEMPLATE + ICON_CSS_CLASSES_TEMPLATE,
+    { funcName, iconCSSUrls, iconCSSDeclarations }
+  );
+  messages.push(...ensureFile(iconCSSClassesPath, iconCSSClassesContent));
+
+  return messages;
+}
+
 /**
  * The options used to ensure a package.
  */
@@ -340,6 +446,53 @@ export interface IEnsurePackageOptions {
   differentVersions?: string[];
 }
 
+/**
+ * Ensure that contents of a file match a supplied string. If they do match,
+ * do nothing and return an empty array. If they don't match, overwrite the
+ * file and return an array with an update message.
+ *
+ * @param path: The path to the file being checked. The file must exist,
+ * or else this function does nothing.
+ *
+ * @param contents: The desired file contents.
+ *
+ * @param prettify: default = true. If true, format the contents with
+ * `prettier` before comparing/writing. Set to false only if you already
+ * know your code won't be modified later by the `prettier` git commit hook.
+ *
+ * @returns a string array with 0 or 1 messages.
+ */
+function ensureFile(
+  path: string,
+  contents: string,
+  prettify: boolean = true
+): string[] {
+  let messages: string[] = [];
+
+  if (!fs.existsSync(path)) {
+    // bail
+    messages.push(
+      `Tried to ensure the contents of ./${path}, but the file does not exist`
+    );
+    return messages;
+  }
+
+  // run the newly generated contents through prettier before comparing
+  if (prettify) {
+    contents = prettier.format(contents, { filepath: path, singleQuote: true });
+  }
+
+  const prev = fs.readFileSync(path, {
+    encoding: 'utf8'
+  });
+  if (prev !== contents) {
+    fs.writeFileSync(path, contents);
+    messages.push(`Updated ./${path}`);
+  }
+
+  return messages;
+}
+
 /**
  * Extract the module imports from a TypeScript source file.
  *
diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts
index b02fa34df2ba..425c502eb521 100644
--- a/buildutils/src/ensure-repo.ts
+++ b/buildutils/src/ensure-repo.ts
@@ -13,7 +13,11 @@
  */
 import * as path from 'path';
 import * as utils from './utils';
-import { ensurePackage, IEnsurePackageOptions } from './ensure-package';
+import {
+  ensurePackage,
+  ensureUiComponents,
+  IEnsurePackageOptions
+} from './ensure-package';
 
 type Dict<T> = { [key: string]: T };
 
@@ -341,6 +345,16 @@ export async function ensureIntegrity(): Promise<boolean> {
     }
   }
 
+  // ensure the icon svg imports
+  pkgMessages = await ensureUiComponents(pkgPaths['@jupyterlab/ui-components']);
+  if (pkgMessages.length > 0) {
+    let pkgName = '@jupyterlab/ui-components';
+    if (!messages[pkgName]) {
+      messages[pkgName] = [];
+    }
+    messages[pkgName] = messages[pkgName].concat(pkgMessages);
+  }
+
   // Handle the top level package.
   let corePath = path.resolve('.', 'package.json');
   let coreData: any = utils.readJSONFile(corePath);
diff --git a/buildutils/src/utils.ts b/buildutils/src/utils.ts
index 504a9c8e5971..1d7535d93e29 100644
--- a/buildutils/src/utils.ts
+++ b/buildutils/src/utils.ts
@@ -114,6 +114,54 @@ export function writeJSONFile(filePath: string, data: any): boolean {
   return false;
 }
 
+/**
+ * Simple template substitution for template vars of the form {{name}}
+ *
+ * @param templ: the template string.
+ * Ex: `This header generated by {{funcName}}`
+ *
+ * @param subs: an object in which the parameter keys are the template
+ * variables and the parameter values are the substitutions.
+ *
+ * @param options: function options.
+ *
+ * @param options.autoindent: default = true. If true, will try to match
+ * indentation level of {{var}} in substituted template.
+ *
+ * @param options.end: default = '\n'. Inserted at the end of
+ * a template post-substitution and post-trim.
+ *
+ * @returns the input template with all {{vars}} substituted, then `.trim`-ed.
+ */
+export function fromTemplate(
+  templ: string,
+  subs: Dict<string>,
+  options: { autoindent?: boolean; end?: string } = {}
+) {
+  // default options values
+  const autoindent =
+    options.autoindent === undefined ? true : options.autoindent;
+  const end = options.end === undefined ? '\n' : options.end;
+
+  Object.keys(subs).forEach(key => {
+    const val = subs[key];
+
+    if (autoindent) {
+      // try to match the indentation level of the {{var}} in the input template.
+      templ = templ.split(`{{${key}}}`).reduce((acc, cur) => {
+        // Regex: 0 or more non-newline whitespaces followed by end of string
+        let indentRe = acc.match(/([^\S\r\n]*).*$/);
+        let indent = indentRe ? indentRe[1] : '';
+        return acc + val.split('\n').join('\n' + indent) + cur;
+      });
+    } else {
+      templ = templ.split(`{{${key}}}`).join(val);
+    }
+  });
+
+  return templ.trim() + end;
+}
+
 /**
  *
  * Call a command, checking its status.
@@ -286,3 +334,43 @@ export function ensureUnixPathSep(source: string) {
   }
   return source.replace(backSlash, '/');
 }
+
+/**
+ * Get the last portion of a path, without its extension (if any).
+ *
+ * @param path - The file path.
+ *
+ * @returns the last part of the path, sans extension.
+ */
+export function stem(path: string): string {
+  return path
+    .split('\\')
+    .pop()
+    .split('/')
+    .pop()
+    .split('.')
+    .shift();
+}
+
+/**
+ * Given a 'snake-case', 'snake_case', or 'snake case' string,
+ * will return the camel case version: 'snakeCase'.
+ *
+ * @param str: the snake-case input string.
+ *
+ * @param upper: default = false. If true, the first letter of the
+ * returned string will be capitalized.
+ *
+ * @returns the camel case version of the input string.
+ */
+export function camelCase(str: string, upper: boolean = false): string {
+  return str.replace(/(?:^\w|[A-Z]|\b\w|\s+|-+|_+)/g, function(match, index) {
+    if (+match === 0 || match[0] === '-') {
+      return '';
+    } else if (index === 0 && !upper) {
+      return match.toLowerCase();
+    } else {
+      return match.toUpperCase();
+    }
+  });
+}
diff --git a/dev_mode/imports.css b/dev_mode/imports.css
index 47f1c8393e13..4b5aab968a1c 100644
--- a/dev_mode/imports.css
+++ b/dev_mode/imports.css
@@ -31,6 +31,7 @@
 @import url('~@jupyterlab/tabmanager-extension/style/index.css');
 @import url('~@jupyterlab/terminal-extension/style/index.css');
 @import url('~@jupyterlab/tooltip-extension/style/index.css');
+@import url('~@jupyterlab/ui-components-extension/style/index.css');
 @import url('~@jupyterlab/vdom-extension/style/index.css');
 @import url('~@jupyterlab/vega4-extension/style/index.css');
 @import url('~@jupyterlab/vega5-extension/style/index.css');
diff --git a/dev_mode/package.json b/dev_mode/package.json
index ae0b22b451d3..c7bbeea24c55 100644
--- a/dev_mode/package.json
+++ b/dev_mode/package.json
@@ -51,6 +51,7 @@
     "@jupyterlab/theme-dark-extension": "~1.1.0-alpha.1",
     "@jupyterlab/theme-light-extension": "~1.1.0-alpha.1",
     "@jupyterlab/tooltip-extension": "~1.1.0-alpha.1",
+    "@jupyterlab/ui-components-extension": "~1.1.0-alpha.1",
     "@jupyterlab/vdom-extension": "~1.1.0-alpha.1",
     "@jupyterlab/vega4-extension": "~1.1.0-alpha.1",
     "@jupyterlab/vega5-extension": "~1.1.0-alpha.1"
@@ -155,6 +156,7 @@
     "@jupyterlab/tooltip": "~1.1.0-alpha.1",
     "@jupyterlab/tooltip-extension": "~1.1.0-alpha.1",
     "@jupyterlab/ui-components": "~1.1.0-alpha.1",
+    "@jupyterlab/ui-components-extension": "~1.1.0-alpha.1",
     "@jupyterlab/vdom": "~1.1.0-alpha.1",
     "@jupyterlab/vdom-extension": "~1.1.0-alpha.1",
     "@jupyterlab/vega4-extension": "~1.1.0-alpha.1",
@@ -210,6 +212,7 @@
       "@jupyterlab/theme-dark-extension": "",
       "@jupyterlab/theme-light-extension": "",
       "@jupyterlab/tooltip-extension": "",
+      "@jupyterlab/ui-components-extension": "",
       "@jupyterlab/vdom-extension": ""
     },
     "mimeExtensions": {
@@ -333,6 +336,7 @@
       "@jupyterlab/tooltip": "../packages/tooltip",
       "@jupyterlab/tooltip-extension": "../packages/tooltip-extension",
       "@jupyterlab/ui-components": "../packages/ui-components",
+      "@jupyterlab/ui-components-extension": "../packages/ui-components-extension",
       "@jupyterlab/vdom": "../packages/vdom",
       "@jupyterlab/vdom-extension": "../packages/vdom-extension",
       "@jupyterlab/vega4-extension": "../packages/vega4-extension",
diff --git a/dev_mode/webpack.config.js b/dev_mode/webpack.config.js
index 78c1769a515d..5a2612582ddf 100644
--- a/dev_mode/webpack.config.js
+++ b/dev_mode/webpack.config.js
@@ -189,8 +189,22 @@ module.exports = [
         },
         { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
         {
+          // in css files, svg is loaded as a url formatted string
           test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-          use: 'url-loader?limit=10000&mimetype=image/svg+xml'
+          issuer: { test: /\.css$/ },
+          use: {
+            loader: 'svg-url-loader',
+            options: { encoding: 'none', limit: 10000 }
+          }
+        },
+        {
+          // in ts and tsx files (both of which compile to js),
+          // svg is loaded as a raw string
+          test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+          issuer: { test: /\.js$/ },
+          use: {
+            loader: 'raw-loader'
+          }
         }
       ]
     },
diff --git a/docs/source/getting_started/issue.rst b/docs/source/getting_started/issue.rst
index 2430273e2c40..7038674bcd58 100644
--- a/docs/source/getting_started/issue.rst
+++ b/docs/source/getting_started/issue.rst
@@ -36,7 +36,7 @@ If you find a problem in JupyterLab, please follow the steps below to diagnose a
 
    - I can reproduce the issue with the classic Jupyter Notebook: The problem is probably not from JupyterLab. It may be in the `Jupyter Notebook server <https://github.com/jupyter/notebook>`__, your kernel, etc. Use your best judgement to file an issue with the appropriate project.
    - I cannot reproduce the issue in classic Jupyter Notebook: Go to step 4.
-4. Try to reproduce the issue in your browser incognito or private browsing modeq. Running in private browser mode ensures your browser state is clean.
+4. Try to reproduce the issue in your browser incognito or private browsing mode. Running in private browser mode ensures your browser state is clean.
 
    - I cannot reproduce the issue in private browsing mode: Perhaps resetting your cookies or other browser state would help.
    - I can reproduce the issue in private browsing mode: Go to :ref:`create-issue`.
diff --git a/examples/app/index.js b/examples/app/index.js
index 4b340f301721..aa9bf195b5d0 100644
--- a/examples/app/index.js
+++ b/examples/app/index.js
@@ -39,7 +39,8 @@ window.addEventListener('load', async function() {
     require('@jupyterlab/terminal-extension'),
     require('@jupyterlab/theme-dark-extension'),
     require('@jupyterlab/theme-light-extension'),
-    require('@jupyterlab/tooltip-extension')
+    require('@jupyterlab/tooltip-extension'),
+    require('@jupyterlab/ui-components-extension')
   ];
   var lab = new JupyterLab();
   lab.registerPluginModules(mods);
diff --git a/examples/filebrowser/package.json b/examples/filebrowser/package.json
index 1bf960f1e249..9b2d960bae55 100644
--- a/examples/filebrowser/package.json
+++ b/examples/filebrowser/package.json
@@ -16,6 +16,7 @@
     "@jupyterlab/fileeditor": "^1.1.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
     "@jupyterlab/theme-light-extension": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/commands": "^1.6.3",
     "@phosphor/widgets": "^1.8.0",
diff --git a/examples/filebrowser/src/index.ts b/examples/filebrowser/src/index.ts
index fd22a47a41c9..d93c4e493a64 100644
--- a/examples/filebrowser/src/index.ts
+++ b/examples/filebrowser/src/index.ts
@@ -21,19 +21,21 @@ import { ServiceManager } from '@jupyterlab/services';
 
 import { Dialog, ToolbarButton, showDialog } from '@jupyterlab/apputils';
 
-import { FileBrowser, FileBrowserModel } from '@jupyterlab/filebrowser';
+import {
+  CodeMirrorEditorFactory,
+  CodeMirrorMimeTypeService
+} from '@jupyterlab/codemirror';
 
 import { DocumentManager } from '@jupyterlab/docmanager';
 
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 
-import {
-  CodeMirrorEditorFactory,
-  CodeMirrorMimeTypeService
-} from '@jupyterlab/codemirror';
+import { FileBrowser, FileBrowserModel } from '@jupyterlab/filebrowser';
 
 import { FileEditorFactory } from '@jupyterlab/fileeditor';
 
+import { defaultIconRegistry } from '@jupyterlab/ui-components';
+
 function main(): void {
   let manager = new ServiceManager();
   void manager.ready.then(() => {
@@ -85,7 +87,10 @@ function createApp(manager: ServiceManager.IManager): void {
 
   let commands = new CommandRegistry();
 
-  let fbModel = new FileBrowserModel({ manager: docManager });
+  let fbModel = new FileBrowserModel({
+    manager: docManager,
+    iconRegistry: defaultIconRegistry
+  });
   let fbWidget = new FileBrowser({
     id: 'filebrowser',
     model: fbModel
diff --git a/jupyterlab/commands.py b/jupyterlab/commands.py
index da2ecfc009c0..64c781f5383c 100644
--- a/jupyterlab/commands.py
+++ b/jupyterlab/commands.py
@@ -29,6 +29,7 @@
 
 from .semver import Range, gte, lt, lte, gt, make_semver
 from .jlpmapp import YARN_PATH, HERE
+from .coreconfig import _get_default_core_data
 
 
 # The regex for expecting the webpack output.
@@ -283,7 +284,7 @@ def watch_dev(logger=None):
     return package_procs + [wp_proc]
 
 
-def watch(app_dir=None, logger=None):
+def watch(app_dir=None, logger=None, core_config=None):
     """Watch the application.
 
     Parameters
@@ -299,11 +300,11 @@ def watch(app_dir=None, logger=None):
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.watch()
 
 
-def install_extension(extension, app_dir=None, logger=None):
+def install_extension(extension, app_dir=None, logger=None, core_config=None):
     """Install an extension package into JupyterLab.
 
     The extension is first validated.
@@ -312,24 +313,24 @@ def install_extension(extension, app_dir=None, logger=None):
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.install_extension(extension)
 
 
-def uninstall_extension(name=None, app_dir=None, logger=None, all_=False):
+def uninstall_extension(name=None, app_dir=None, logger=None, all_=False, core_config=None):
     """Uninstall an extension by name or path.
 
     Returns `True` if a rebuild is recommended, `False` otherwise.
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     if all_ is True:
         return handler.uninstall_all_extensions()
     return handler.uninstall_extension(name)
 
 
-def update_extension(name=None, all_=False, app_dir=None, logger=None):
+def update_extension(name=None, all_=False, app_dir=None, logger=None, core_config=None):
     """Update an extension by name, or all extensions.
 
     Either `name` must be given as a string, or `all_` must be `True`.
@@ -339,7 +340,7 @@ def update_extension(name=None, all_=False, app_dir=None, logger=None):
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     if all_ is True:
         return handler.update_all_extensions()
     return handler.update_extension(name)
@@ -363,96 +364,96 @@ def clean(app_dir=None, logger=None):
 
 def build(app_dir=None, name=None, version=None, static_url=None,
           logger=None, command='build:prod', kill_event=None,
-          clean_staging=False):
+          clean_staging=False, core_config=None):
     """Build the JupyterLab application.
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger, kill_event=kill_event)
+    handler = _AppHandler(app_dir, logger, kill_event=kill_event, core_config=core_config)
     return handler.build(name=name, version=version, static_url=static_url,
                          command=command, clean_staging=clean_staging)
 
 
-def get_app_info(app_dir=None, logger=None):
+def get_app_info(app_dir=None, logger=None, core_config=None):
     """Get a dictionary of information about the app.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.info
 
 
-def enable_extension(extension, app_dir=None, logger=None):
+def enable_extension(extension, app_dir=None, logger=None, core_config=None):
     """Enable a JupyterLab extension.
 
     Returns `True` if a rebuild is recommended, `False` otherwise.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.toggle_extension(extension, False)
 
 
-def disable_extension(extension, app_dir=None, logger=None):
+def disable_extension(extension, app_dir=None, logger=None, core_config=None):
     """Disable a JupyterLab package.
 
     Returns `True` if a rebuild is recommended, `False` otherwise.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.toggle_extension(extension, True)
 
 
-def check_extension(extension, app_dir=None, installed=False, logger=None):
+def check_extension(extension, app_dir=None, installed=False, logger=None, core_config=None):
     """Check if a JupyterLab extension is enabled or disabled.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.check_extension(extension, installed)
 
 
-def build_check(app_dir=None, logger=None):
+def build_check(app_dir=None, logger=None, core_config=None):
     """Determine whether JupyterLab should be built.
 
     Returns a list of messages.
     """
     logger = _ensure_logger(logger)
     _node_check(logger)
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.build_check()
 
 
-def list_extensions(app_dir=None, logger=None):
+def list_extensions(app_dir=None, logger=None, core_config=None):
     """List the extensions.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.list_extensions()
 
 
-def link_package(path, app_dir=None, logger=None):
+def link_package(path, app_dir=None, logger=None, core_config=None):
     """Link a package against the JupyterLab build.
 
     Returns `True` if a rebuild is recommended, `False` otherwise.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.link_package(path)
 
 
-def unlink_package(package, app_dir=None, logger=None):
+def unlink_package(package, app_dir=None, logger=None, core_config=None):
     """Unlink a package from JupyterLab by path or name.
 
     Returns `True` if a rebuild is recommended, `False` otherwise.
     """
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.unlink_package(package)
 
 
-def get_app_version(app_dir=None):
+def get_app_version(app_dir=None, core_config=None):
     """Get the application version."""
     app_dir = app_dir or get_app_dir()
-    handler = _AppHandler(app_dir)
+    handler = _AppHandler(app_dir, core_config=core_config)
     return handler.info['version']
 
 
-def get_latest_compatible_package_versions(names, app_dir=None, logger=None):
+def get_latest_compatible_package_versions(names, app_dir=None, logger=None, core_config=None):
     """Get the latest compatible version of a list of packages.
     """
     app_dir = app_dir or get_app_dir()
-    handler = _AppHandler(app_dir, logger)
+    handler = _AppHandler(app_dir, logger, core_config=core_config)
     return handler.latest_compatible_package_versions(names)
 
 
@@ -476,12 +477,15 @@ def read_package(target):
 
 class _AppHandler(object):
 
-    def __init__(self, app_dir, logger=None, kill_event=None):
+    def __init__(self, app_dir, logger=None, kill_event=None, core_config=None):
         """Create a new _AppHandler object
         """
         self.app_dir = app_dir or get_app_dir()
         self.sys_dir = get_app_dir()
         self.logger = _ensure_logger(logger)
+        self.core_data = (
+            core_config._data if core_config else _get_default_core_data()
+        )
         self.info = self._get_app_info()
         self.kill_event = kill_event or Event()
         # TODO: Make this configurable
@@ -713,7 +717,6 @@ def uninstall_extension(self, name):
         Returns `True` if a rebuild is recommended, `False` otherwise.
         """
         # Allow for uninstalled core extensions.
-        data = self.info['core_data']
         if name in self.info['core_extensions']:
             config = self._read_build_config()
             uninstalled = config.get('uninstalled_core_extensions', [])
@@ -775,7 +778,7 @@ def update_extension(self, name):
         Returns `True` if a rebuild is recommended, `False` otherwise.
         """
         if name not in self.info['extensions']:
-            self.logger.warn('No labextension named "%s" installed' % name)
+            self.logger.warning('No labextension named "%s" installed' % name)
             return False
         return self._update_extension(name)
 
@@ -815,8 +818,8 @@ def link_package(self, path):
             return self.install_extension(path)
 
         # Warn that it is a linked package.
-        self.logger.warn('Installing %s as a linked package:', path)
-        [self.logger.warn(m) for m in messages]
+        self.logger.warning('Installing %s as a linked package:', path)
+        [self.logger.warning(m) for m in messages]
 
         # Add to metadata.
         config = self._read_build_config()
@@ -938,7 +941,7 @@ def _get_app_info(self):
         """
 
         info = dict()
-        info['core_data'] = core_data = _get_core_data()
+        info['core_data'] = core_data = self.core_data
         info['extensions'] = extensions = self._get_extensions(core_data)
         page_config = self._read_page_config()
         info['disabled'] = page_config.get('disabledExtensions', [])
@@ -963,7 +966,8 @@ def _get_app_info(self):
         info['sys_dir'] = self.sys_dir
         info['app_dir'] = self.app_dir
 
-        info['core_extensions'] = core_extensions = _get_core_extensions()
+        info['core_extensions'] = core_extensions = _get_core_extensions(
+            self.core_data)
 
         disabled_core = []
         for key in core_extensions:
@@ -1390,9 +1394,8 @@ def _install_extension(self, extension, tempdir):
             raise ValueError(msg % (extension, '\n'.join(messages)))
 
         # Verify package compatibility.
-        core_data = _get_core_data()
         deps = data.get('dependencies', dict())
-        errors = _validate_compatibility(extension, deps, core_data)
+        errors = _validate_compatibility(extension, deps, self.core_data)
         if errors:
             msg = _format_compatibility_errors(
                 data['name'], data['version'], errors
@@ -1628,7 +1631,7 @@ def _node_check(logger):
         output = subprocess.check_output([node, 'node-version-check.js'], cwd=HERE)
         logger.debug(output.decode('utf-8'))
     except Exception:
-        data = _get_core_data()
+        data = CoreConfig()._data
         ver = data['engines']['node']
         msg = 'Please install nodejs %s before continuing. nodejs may be installed using conda or directly from the nodejs website.' % ver
         raise ValueError(msg)
@@ -1728,13 +1731,6 @@ def _tarsum(input_file):
     return h.hexdigest()
 
 
-def _get_core_data():
-    """Get the data for the app template.
-    """
-    with open(pjoin(HERE, 'staging', 'package.json')) as fid:
-        return json.load(fid)
-
-
 def _get_static_data(app_dir):
     """Get the data for the app static dir.
     """
@@ -1931,10 +1927,10 @@ def _compat_error_age(errors):
     return 0
 
 
-def _get_core_extensions():
+def _get_core_extensions(core_data):
     """Get the core extensions.
     """
-    data = _get_core_data()['jupyterlab']
+    data = core_data['jupyterlab']
     return list(data['extensions']) + list(data['mimeExtensions'])
 
 
diff --git a/jupyterlab/coreconfig.py b/jupyterlab/coreconfig.py
new file mode 100644
index 000000000000..af08f6cdd45b
--- /dev/null
+++ b/jupyterlab/coreconfig.py
@@ -0,0 +1,165 @@
+# coding: utf-8
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from collections import defaultdict
+from itertools import filterfalse
+import json
+import os.path as osp
+
+from .jlpmapp import HERE
+
+
+def pjoin(*args):
+    """Join paths to create a real path.
+    """
+    return osp.abspath(osp.join(*args))
+
+
+def _get_default_core_data():
+    """Get the data for the app template.
+    """
+    with open(pjoin(HERE, 'staging', 'package.json')) as fid:
+        return json.load(fid)
+
+
+def _is_lab_package(name):
+    """Whether a package name is in the lab namespace"""
+    return name.startswith('@jupyterlab/')
+
+
+def _only_nonlab(collection):
+    """Filter a dict/sequence to remove all lab packages
+
+    This is useful to take the default values of e.g. singletons and filter
+    away the '@jupyterlab/' namespace packages, but leave any others (e.g.
+    phosphor and react).
+    """
+    if isinstance(collection, dict):
+        return dict(
+            (k, v) for (k, v) in collection.items()
+            if not _is_lab_package(k)
+        )
+    elif isinstance(collection, (list, tuple)):
+        return list(filterfalse(_is_lab_package, collection))
+    raise TypeError('collection arg should be either dict or list/tuple')
+
+
+class CoreConfig:
+    """An object representing a core config.
+
+    This enables custom lab application to override some parts of the core
+    configuration of the build system.
+    """
+    def __init__(self):
+        self._data = _get_default_core_data()
+
+    def add(self, name, semver, extension=False, mime_extension=False):
+        """Remove an extension/singleton.
+
+        If neither extension or mimeExtension is True (the default)
+        the package is added as a singleton dependency.
+
+        name: string
+            The npm package name
+        semver: string
+            The semver range for the package
+        extension: bool
+            Whether the package is an extension
+        mime_extension: bool
+            Whether the package is a MIME extension
+        """
+        data = self._data
+        if not name:
+            raise ValueError('Missing package name')
+        if not semver:
+            raise ValueError('Missing package semver')
+        if name in data['resolutions']:
+            raise ValueError('Package already present: %r' % (name,))
+        data['resolutions'][name] = semver
+
+        # If both mimeExtension and extensions are True, treat
+        # as mime extension
+        if mime_extension:
+            data['jupyterlab']['mimeExtensions'][name] = ""
+            data['dependencies'][name] = semver
+        elif extension:
+            data['jupyterlab']['extensions'][name] = ""
+            data['dependencies'][name] = semver
+        else:
+            data['jupyterlab']['singletonPackages'].append(name)
+
+    def remove(self, name):
+        """Remove a package/extension.
+
+        name: string
+            The npm package name
+        """
+        data = self._data
+        maps = (
+            data['dependencies'],
+            data['resolutions'],
+            data['jupyterlab']['extensions'],
+            data['jupyterlab']['mimeExtensions'],
+        )
+        for m in maps:
+            try:
+                del m[name]
+            except KeyError:
+                pass
+
+        data['jupyterlab']['singletonPackages'].remove(name)
+
+    def clear_packages(self, lab_only=True):
+        """Clear the packages/extensions.
+        """
+        data = self._data
+        # Clear all dependencies
+        if lab_only:
+            # Clear all "@jupyterlab/" dependencies
+            data['dependencies'] = _only_nonlab(data['dependencies'])
+            data['resolutions'] = _only_nonlab(data['resolutions'])
+            data['jupyterlab']['extensions'] = _only_nonlab(
+                data['jupyterlab']['extensions'])
+            data['jupyterlab']['mimeExtensions'] = _only_nonlab(
+                data['jupyterlab']['mimeExtensions'])
+            data['jupyterlab']['singletonPackages'] = _only_nonlab(
+                data['jupyterlab']['singletonPackages'])
+        else:
+            data['dependencies'] = {}
+            data['resolutions'] = {}
+            data['jupyterlab']['extensions'] = {}
+            data['jupyterlab']['mimeExtensions'] = {}
+            data['jupyterlab']['singletonPackages'] = []
+
+    @property
+    def extensions(self):
+        """A dict mapping all extension names to their semver"""
+        data = self._data
+        return dict(
+            (k, data['resolutions'][k])
+            for k in data['jupyterlab']['extensions'].keys())
+
+    @property
+    def mime_extensions(self):
+        """A dict mapping all MIME extension names to their semver"""
+        data = self._data
+        return dict(
+            (k, data['resolutions'][k])
+            for k in data['jupyterlab']['mimeExtensions'].keys())
+
+    @property
+    def singletons(self):
+        """A dict mapping all singleton names to their semver"""
+        data = self._data
+        return dict(
+            (k, data['resolutions'].get(k, None))
+            for k in data['jupyterlab']['singletonPackages'])
+
+    @property
+    def static_dir(self):
+        return self._data['jupyterlab']['staticDir']
+
+    @static_dir.setter
+    def static_dir(self, static_dir):
+        self._data['jupyterlab']['staticDir'] = static_dir
diff --git a/jupyterlab/handlers/build_handler.py b/jupyterlab/handlers/build_handler.py
index 80cf27e5fa89..c8bfbfec15db 100644
--- a/jupyterlab/handlers/build_handler.py
+++ b/jupyterlab/handlers/build_handler.py
@@ -21,10 +21,11 @@ class Builder(object):
     _kill_event = None
     _future = None
 
-    def __init__(self, log, core_mode, app_dir):
+    def __init__(self, log, core_mode, app_dir, core_config=None):
         self.log = log
         self.core_mode = core_mode
         self.app_dir = app_dir
+        self.core_config = core_config
 
     @gen.coroutine
     def get_status(self):
@@ -34,7 +35,8 @@ def get_status(self):
             raise gen.Return(dict(status='building', message=''))
 
         try:
-            messages = yield self._run_build_check(self.app_dir, self.log)
+            messages = yield self._run_build_check(
+                self.app_dir, self.log, self.core_config)
             status = 'needed' if messages else 'stable'
             if messages:
                 self.log.warn('Build recommended')
@@ -60,7 +62,8 @@ def build(self):
             self.building = True
             self._kill_event = evt = Event()
             try:
-                yield self._run_build(self.app_dir, self.log, evt)
+                yield self._run_build(
+                    self.app_dir, self.log, evt, self.core_config)
                 future.set_result(True)
             except Exception as e:
                 if str(e) == 'Aborted':
@@ -84,12 +87,15 @@ def cancel(self):
         self.canceled = True
 
     @run_on_executor
-    def _run_build_check(self, app_dir, logger):
-        return build_check(app_dir=app_dir, logger=logger)
+    def _run_build_check(self, app_dir, logger, core_config):
+        return build_check(
+            app_dir=app_dir, logger=logger, core_config=core_config)
 
     @run_on_executor
-    def _run_build(self, app_dir, logger, kill_event):
-        kwargs = dict(app_dir=app_dir, logger=logger, kill_event=kill_event, command='build')
+    def _run_build(self, app_dir, logger, kill_event, core_config):
+        kwargs = dict(
+            app_dir=app_dir, logger=logger, kill_event=kill_event,
+            core_config=core_config, command='build')
         try:
             return build(**kwargs)
         except Exception as e:
@@ -114,7 +120,7 @@ def get(self):
     @web.authenticated
     @gen.coroutine
     def delete(self):
-        self.log.warn('Canceling build')
+        self.log.warning('Canceling build')
         try:
             yield self.builder.cancel()
         except Exception as e:
diff --git a/jupyterlab/handlers/extension_manager_handler.py b/jupyterlab/handlers/extension_manager_handler.py
index 3ef873e357ba..df02348df367 100644
--- a/jupyterlab/handlers/extension_manager_handler.py
+++ b/jupyterlab/handlers/extension_manager_handler.py
@@ -66,9 +66,10 @@ def _build_check_info(app_dir, logger):
 class ExtensionManager(object):
     executor = ThreadPoolExecutor(max_workers=1)
 
-    def __init__(self, log, app_dir):
+    def __init__(self, log, app_dir, core_config=None):
         self.log = log
         self.app_dir = app_dir
+        self.core_config = core_config
         self._outdated = None
         # To start fetching data on outdated extensions immediately, uncomment:
         # IOLoop.current().spawn_callback(self._get_outdated)
@@ -122,7 +123,9 @@ def list_extensions(self):
     def install(self, extension):
         """Handle an install/update request"""
         try:
-            install_extension(extension, app_dir=self.app_dir, logger=self.log)
+            install_extension(
+                extension, app_dir=self.app_dir, logger=self.log,
+                core_config=self.core_config)
         except ValueError as e:
             raise gen.Return(dict(status='error', message=str(e)))
         raise gen.Return(dict(status='ok',))
@@ -130,19 +133,25 @@ def install(self, extension):
     @gen.coroutine
     def uninstall(self, extension):
         """Handle an uninstall request"""
-        did_uninstall = uninstall_extension(extension, app_dir=self.app_dir, logger=self.log)
+        did_uninstall = uninstall_extension(
+            extension, app_dir=self.app_dir, logger=self.log,
+            core_config=self.core_config)
         raise gen.Return(dict(status='ok' if did_uninstall else 'error',))
 
     @gen.coroutine
     def enable(self, extension):
         """Handle an enable request"""
-        enable_extension(extension, app_dir=self.app_dir, logger=self.log)
+        enable_extension(
+            extension, app_dir=self.app_dir, logger=self.log,
+            core_config=self.core_config)
         raise gen.Return(dict(status='ok',))
 
     @gen.coroutine
     def disable(self, extension):
         """Handle a disable request"""
-        disable_extension(extension, app_dir=self.app_dir, logger=self.log)
+        disable_extension(
+            extension, app_dir=self.app_dir, logger=self.log,
+            core_config=self.core_config)
         raise gen.Return(dict(status='ok',))
 
     @gen.coroutine
@@ -187,6 +196,7 @@ def _load_outdated(self):
             names,
             app_dir=self.app_dir,
             logger=self.log,
+            core_config=self.core_config,
         )
         raise gen.Return(data)
 
diff --git a/jupyterlab/labapp.py b/jupyterlab/labapp.py
index a79cf8ff7e7b..992784d02560 100644
--- a/jupyterlab/labapp.py
+++ b/jupyterlab/labapp.py
@@ -14,7 +14,7 @@
 from jupyterlab_server import slugify, WORKSPACE_EXTENSION
 from notebook.notebookapp import NotebookApp, aliases, flags
 from notebook.utils import url_path_join as ujoin
-from traitlets import Bool, Unicode
+from traitlets import Bool, Instance, Unicode
 
 from ._version import __version__
 from .debuglog import DebugLogFileMixin
@@ -23,6 +23,7 @@
     build, clean, get_app_dir, get_app_version, get_user_settings_dir,
     get_workspaces_dir
 )
+from .coreconfig import CoreConfig
 
 
 build_aliases = dict(base_aliases)
@@ -53,6 +54,9 @@ class LabBuildApp(JupyterApp, DebugLogFileMixin):
     aliases = build_aliases
     flags = build_flags
 
+    # Not configurable!
+    core_config = Instance(CoreConfig, allow_none=True)
+
     app_dir = Unicode('', config=True,
         help="The app directory to build in")
 
@@ -88,7 +92,8 @@ def start(self):
                 clean(self.app_dir)
             self.log.info('Building in %s', app_dir)
             build(app_dir=app_dir, name=self.name, version=self.version,
-                  command=command, logger=self.log)
+                  command=command, logger=self.log,
+                  core_config=self.core_config)
 
 
 clean_aliases = dict(base_aliases)
@@ -105,6 +110,9 @@ class LabCleanApp(JupyterApp):
     """
     aliases = clean_aliases
 
+    # Not configurable!
+    core_config = Instance(CoreConfig, allow_none=True)
+
     app_dir = Unicode('', config=True, help='The app directory to clean')
 
     def start(self):
@@ -411,7 +419,7 @@ def init_server_extensions(self):
         super(LabApp, self).init_server_extensions()
         msg = 'JupyterLab server extension not enabled, manually loading...'
         if not self.nbserver_extensions.get('jupyterlab', False):
-            self.log.warn(msg)
+            self.log.warning(msg)
             load_jupyter_server_extension(self)
 
 
diff --git a/jupyterlab/labextensions.py b/jupyterlab/labextensions.py
index bc5071a2c030..6d1984737eb4 100644
--- a/jupyterlab/labextensions.py
+++ b/jupyterlab/labextensions.py
@@ -11,7 +11,7 @@
 
 from jupyter_core.application import JupyterApp, base_flags, base_aliases
 
-from traitlets import Bool, Unicode
+from traitlets import Bool, Instance, Unicode
 
 from .commands import (
     install_extension, uninstall_extension, list_extensions,
@@ -19,6 +19,7 @@
     link_package, unlink_package, build, get_app_version, HERE,
     update_extension,
 )
+from .coreconfig import CoreConfig
 from .debuglog import DebugLogFileMixin
 
 
@@ -65,6 +66,9 @@ class BaseExtensionApp(JupyterApp, DebugLogFileMixin):
     flags = flags
     aliases = aliases
 
+    # Not configurable!
+    core_config = Instance(CoreConfig, allow_none=True)
+
     app_dir = Unicode('', config=True,
         help="The app directory to target")
 
@@ -95,7 +99,8 @@ def start(self):
                 command = ':'.join(parts)
 
                 build(app_dir=self.app_dir, clean_staging=self.should_clean,
-                      logger=self.log, command=command)
+                      logger=self.log, command=command,
+                      core_config=self.core_config)
 
     def run_task(self):
         pass
@@ -111,7 +116,9 @@ class InstallLabExtensionApp(BaseExtensionApp):
     def run_task(self):
         self.extra_args = self.extra_args or [os.getcwd()]
         return any([
-            install_extension(arg, self.app_dir, logger=self.log)
+            install_extension(
+                arg, self.app_dir, logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args
         ])
 
@@ -128,9 +135,13 @@ def run_task(self):
             self.log.warn('Specify an extension to update, or use --all to update all extensions')
             return False
         if self.all:
-            return update_extension(all_=True, app_dir=self.app_dir, logger=self.log)
+            return update_extension(
+                all_=True, app_dir=self.app_dir, logger=self.log,
+                core_config=self.core_config)
         return any([
-            update_extension(name=arg, app_dir=self.app_dir, logger=self.log)
+            update_extension(
+                name=arg, app_dir=self.app_dir, logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args
         ])
 
@@ -149,7 +160,9 @@ class LinkLabExtensionApp(BaseExtensionApp):
     def run_task(self):
         self.extra_args = self.extra_args or [os.getcwd()]
         return any([
-            link_package(arg, self.app_dir, logger=self.log)
+            link_package(
+                arg, self.app_dir, logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args
         ])
 
@@ -160,7 +173,9 @@ class UnlinkLabExtensionApp(BaseExtensionApp):
     def run_task(self):
         self.extra_args = self.extra_args or [os.getcwd()]
         return any([
-            unlink_package(arg, self.app_dir, logger=self.log)
+            unlink_package(
+                arg, self.app_dir, logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args
         ])
 
@@ -175,7 +190,9 @@ class UninstallLabExtensionApp(BaseExtensionApp):
     def run_task(self):
         self.extra_args = self.extra_args or [os.getcwd()]
         return any([
-            uninstall_extension(arg, all_=self.all, app_dir=self.app_dir, logger=self.log)
+            uninstall_extension(
+                arg, all_=self.all, app_dir=self.app_dir, logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args
         ])
 
@@ -184,14 +201,16 @@ class ListLabExtensionsApp(BaseExtensionApp):
     description = "List the installed labextensions"
 
     def run_task(self):
-        list_extensions(self.app_dir, logger=self.log)
+        list_extensions(
+            self.app_dir, logger=self.log, core_config=self.core_config)
 
 
 class EnableLabExtensionsApp(BaseExtensionApp):
     description = "Enable labextension(s) by name"
 
     def run_task(self):
-        [enable_extension(arg, self.app_dir, logger=self.log)
+        [enable_extension(
+            arg, self.app_dir, logger=self.log, core_config=self.core_config)
          for arg in self.extra_args]
 
 
@@ -199,7 +218,8 @@ class DisableLabExtensionsApp(BaseExtensionApp):
     description = "Disable labextension(s) by name"
 
     def run_task(self):
-        [disable_extension(arg, self.app_dir, logger=self.log)
+        [disable_extension(
+            arg, self.app_dir, logger=self.log, core_config=self.core_config)
          for arg in self.extra_args]
 
 
@@ -215,7 +235,8 @@ def run_task(self):
             check_extension(
                 arg, self.app_dir,
                 self.should_check_installed_only,
-                logger=self.log)
+                logger=self.log,
+                core_config=self.core_config)
             for arg in self.extra_args)
         if not all_enabled:
             self.exit(1)
diff --git a/jupyterlab/staging/webpack.config.js b/jupyterlab/staging/webpack.config.js
index 78c1769a515d..5a2612582ddf 100644
--- a/jupyterlab/staging/webpack.config.js
+++ b/jupyterlab/staging/webpack.config.js
@@ -189,8 +189,22 @@ module.exports = [
         },
         { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
         {
+          // in css files, svg is loaded as a url formatted string
           test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-          use: 'url-loader?limit=10000&mimetype=image/svg+xml'
+          issuer: { test: /\.css$/ },
+          use: {
+            loader: 'svg-url-loader',
+            options: { encoding: 'none', limit: 10000 }
+          }
+        },
+        {
+          // in ts and tsx files (both of which compile to js),
+          // svg is loaded as a raw string
+          test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+          issuer: { test: /\.js$/ },
+          use: {
+            loader: 'raw-loader'
+          }
         }
       ]
     },
diff --git a/jupyterlab/tests/test_jupyterlab.py b/jupyterlab/tests/test_jupyterlab.py
index 415b19c23fd7..73c95f6173a7 100644
--- a/jupyterlab/tests/test_jupyterlab.py
+++ b/jupyterlab/tests/test_jupyterlab.py
@@ -5,6 +5,7 @@
 # Distributed under the terms of the Modified BSD License.
 import glob
 import json
+import logging
 import os
 import shutil
 import sys
@@ -23,9 +24,9 @@
     install_extension, uninstall_extension, list_extensions,
     build, link_package, unlink_package, build_check,
     disable_extension, enable_extension, get_app_info,
-    check_extension, _test_overlap, _get_core_data,
-    update_extension
+    check_extension, _test_overlap, update_extension
 )
+from jupyterlab.coreconfig import CoreConfig, _get_default_core_data
 
 here = os.path.dirname(os.path.abspath(__file__))
 
@@ -379,6 +380,51 @@ def test_build_custom(self):
         assert data['jupyterlab']['version'] == '1.0'
         assert data['jupyterlab']['staticUrl'] == 'bar'
 
+    def test_build_custom_minimal_core_config(self):
+        default_config = CoreConfig()
+        core_config = CoreConfig()
+        core_config.clear_packages()
+        logger = logging.getLogger('jupyterlab_test_logger')
+        logger.setLevel('DEBUG')
+        extensions = (
+            '@jupyterlab/application-extension',
+            '@jupyterlab/apputils-extension',
+        )
+        singletons = (
+            "@jupyterlab/application",
+            "@jupyterlab/apputils",
+            "@jupyterlab/coreutils",
+            "@jupyterlab/services",
+        )
+        for name in extensions:
+            semver = default_config.extensions[name]
+            core_config.add(name, semver, extension=True)
+        for name in singletons:
+            semver = default_config.singletons[name]
+            core_config.add(name, semver)
+
+        assert install_extension(self.mock_extension) is True
+        build(core_config=core_config, logger=logger)
+
+        # check static directory.
+        entry = pjoin(self.app_dir, 'static', 'index.out.js')
+        with open(entry) as fid:
+            data = fid.read()
+        assert self.pkg_names['extension'] in data
+
+        pkg = pjoin(self.app_dir, 'static', 'package.json')
+        with open(pkg) as fid:
+            data = json.load(fid)
+        assert list(data['jupyterlab']['extensions'].keys()) == [
+            '@jupyterlab/application-extension',
+            '@jupyterlab/apputils-extension',
+            self.pkg_names['extension'],
+        ]
+        assert data['jupyterlab']['mimeExtensions'] == {}
+        for pkg in data['jupyterlab']['singletonPackages']:
+            if pkg.startswith('@jupyterlab/'):
+                assert pkg in singletons
+
     def test_load_extension(self):
         app = NotebookApp()
         stderr = sys.stderr
@@ -477,7 +523,7 @@ def test_compatibility(self):
         assert _test_overlap('<0.6', '0.1') is None
 
     def test_install_compatible(self):
-        core_data = _get_core_data()
+        core_data = _get_default_core_data()
         current_app_dep = core_data['dependencies']['@jupyterlab/application']
         def _gen_dep(ver):
             return { "dependencies": {
diff --git a/package.json b/package.json
index 0790ee3d7fbd..98273ec575d3 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "lerna": "^3.13.2",
     "lint-staged": "^8.1.5",
     "open-cli": "^5.0.0",
-    "prettier": "^1.17.0",
+    "prettier": "^1.18.2",
     "tslint": "^5.15.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
diff --git a/packages/application/package.json b/packages/application/package.json
index cc8c7853c8b4..f1a0ee521bda 100644
--- a/packages/application/package.json
+++ b/packages/application/package.json
@@ -42,6 +42,7 @@
     "@jupyterlab/rendermime": "^1.1.0-alpha.1",
     "@jupyterlab/rendermime-interfaces": "^1.4.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/application": "^1.6.3",
     "@phosphor/commands": "^1.6.3",
diff --git a/packages/application/src/shell.ts b/packages/application/src/shell.ts
index 25d3f821849b..ca9778a0cdae 100644
--- a/packages/application/src/shell.ts
+++ b/packages/application/src/shell.ts
@@ -5,6 +5,8 @@ import { Debouncer } from '@jupyterlab/coreutils';
 
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 
+import { DockPanelSvg, TabBarSvg } from '@jupyterlab/ui-components';
+
 import { ArrayExt, find, IIterator, iter, toArray } from '@phosphor/algorithm';
 
 import { PromiseDelegate, Token } from '@phosphor/coreutils';
@@ -176,7 +178,9 @@ export class LabShell extends Widget implements JupyterFrontEnd.IShell {
     let bottomPanel = (this._bottomPanel = new BoxPanel());
     let topPanel = (this._topPanel = new Panel());
     let hboxPanel = new BoxPanel();
-    let dockPanel = (this._dockPanel = new DockPanel());
+    let dockPanel = (this._dockPanel = new DockPanelSvg({
+      kind: 'dockPanelBar'
+    }));
     let headerPanel = (this._headerPanel = new Panel());
     MessageLoop.installMessageHook(dockPanel, this._dockChildHook);
 
@@ -1028,7 +1032,8 @@ namespace Private {
      * Construct a new side bar handler.
      */
     constructor(side: string) {
-      this._sideBar = new TabBar<Widget>({
+      this._sideBar = new TabBarSvg<Widget>({
+        kind: 'sideBar',
         insertBehavior: 'none',
         removeBehavior: 'none',
         allowDeselect: true
diff --git a/packages/application/style/icons.css b/packages/application/style/icons.css
index 3b59b877e285..a21e91197379 100644
--- a/packages/application/style/icons.css
+++ b/packages/application/style/icons.css
@@ -3,6 +3,204 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
+/**
+ * Support for icons as inline SVG HTMLElements
+ */
+
+/* recolor the primary elements of an icon */
+.jp-icon0[fill] {
+  fill: var(--jp-inverse-layout-color0);
+}
+.jp-icon1[fill] {
+  fill: var(--jp-inverse-layout-color1);
+}
+.jp-icon2[fill] {
+  fill: var(--jp-inverse-layout-color2);
+}
+.jp-icon3[fill] {
+  fill: var(--jp-inverse-layout-color3);
+}
+.jp-icon4[fill] {
+  fill: var(--jp-inverse-layout-color4);
+}
+
+.jp-icon0[stroke] {
+  stroke: var(--jp-inverse-layout-color0);
+}
+.jp-icon1[stroke] {
+  stroke: var(--jp-inverse-layout-color1);
+}
+.jp-icon2[stroke] {
+  stroke: var(--jp-inverse-layout-color2);
+}
+.jp-icon3[stroke] {
+  stroke: var(--jp-inverse-layout-color3);
+}
+.jp-icon4[stroke] {
+  stroke: var(--jp-inverse-layout-color4);
+}
+
+/* recolor the accent elements of an icon */
+.jp-icon-accent0[fill] {
+  fill: var(--jp-layout-color0);
+}
+.jp-icon-accent1[fill] {
+  fill: var(--jp-layout-color1);
+}
+.jp-icon-accent2[fill] {
+  fill: var(--jp-layout-color2);
+}
+.jp-icon-accent3[fill] {
+  fill: var(--jp-layout-color3);
+}
+.jp-icon-accent4[fill] {
+  fill: var(--jp-layout-color4);
+}
+
+.jp-icon-accent0[stroke] {
+  stroke: var(--jp-layout-color0);
+}
+.jp-icon-accent1[stroke] {
+  stroke: var(--jp-layout-color1);
+}
+.jp-icon-accent2[stroke] {
+  stroke: var(--jp-layout-color2);
+}
+.jp-icon-accent3[stroke] {
+  stroke: var(--jp-layout-color3);
+}
+.jp-icon-accent4[stroke] {
+  stroke: var(--jp-layout-color4);
+}
+
+/* brand icon colors. Same for light and dark */
+.jp-icon-brand0[fill] {
+  fill: var(--jp-brand-color0);
+}
+.jp-icon-brand1[fill] {
+  fill: var(--jp-brand-color1);
+}
+.jp-icon-brand2[fill] {
+  fill: var(--jp-brand-color2);
+}
+.jp-icon-brand3[fill] {
+  fill: var(--jp-brand-color3);
+}
+.jp-icon-brand4[fill] {
+  fill: var(--jp-brand-color4);
+}
+
+.jp-icon-brand0[stroke] {
+  stroke: var(--jp-brand-color0);
+}
+.jp-icon-brand1[stroke] {
+  stroke: var(--jp-brand-color1);
+}
+.jp-icon-brand2[stroke] {
+  stroke: var(--jp-brand-color2);
+}
+.jp-icon-brand3[stroke] {
+  stroke: var(--jp-brand-color3);
+}
+.jp-icon-brand4[stroke] {
+  stroke: var(--jp-brand-color4);
+}
+
+/* warn icon colors. Same for light and dark */
+.jp-icon-warn0[fill] {
+  fill: var(--jp-warn-color0);
+}
+.jp-icon-warn1[fill] {
+  fill: var(--jp-warn-color1);
+}
+.jp-icon-warn2[fill] {
+  fill: var(--jp-warn-color2);
+}
+.jp-icon-warn3[fill] {
+  fill: var(--jp-warn-color3);
+}
+
+.jp-icon-warn0[stroke] {
+  stroke: var(--jp-warn-color0);
+}
+.jp-icon-warn1[stroke] {
+  stroke: var(--jp-warn-color1);
+}
+.jp-icon-warn2[stroke] {
+  stroke: var(--jp-warn-color2);
+}
+.jp-icon-warn3[stroke] {
+  stroke: var(--jp-warn-color3);
+}
+
+/* icon colors that contrast well with each other and most backgrounds */
+.jp-icon-contrast0[fill] {
+  fill: var(--jp-icon-contrast-color0);
+}
+.jp-icon-contrast1[fill] {
+  fill: var(--jp-icon-contrast-color1);
+}
+.jp-icon-contrast2[fill] {
+  fill: var(--jp-icon-contrast-color2);
+}
+.jp-icon-contrast3[fill] {
+  fill: var(--jp-icon-contrast-color3);
+}
+
+.jp-icon-contrast0[stroke] {
+  stroke: var(--jp-icon-contrast-color0);
+}
+.jp-icon-contrast1[stroke] {
+  stroke: var(--jp-icon-contrast-color1);
+}
+.jp-icon-contrast2[stroke] {
+  stroke: var(--jp-icon-contrast-color2);
+}
+.jp-icon-contrast3[stroke] {
+  stroke: var(--jp-icon-contrast-color3);
+}
+
+/* CSS for icons in selected items in the settings editor */
+#setting-editor .jp-PluginList .jp-mod-selected .jp-icon-selectable[fill] {
+  fill: white;
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-icon-selectable-inverse[fill] {
+  fill: var(--jp-brand-color1);
+}
+
+/* CSS for icons in selected filebrowser listing items */
+.jp-DirListing-item.jp-mod-selected .jp-icon-selectable[fill] {
+  fill: white;
+}
+
+.jp-DirListing-item.jp-mod-selected .jp-icon-selectable-inverse[fill] {
+  fill: var(--jp-brand-color1);
+}
+
+/* CSS for icons in selected tabs in the sidebar tab manager */
+#tab-manager .p-TabBar-tab.jp-mod-active .jp-icon-selectable[fill] {
+  fill: white;
+}
+
+#tab-manager .p-TabBar-tab.jp-mod-active .jp-icon-selectable-inverse[fill] {
+  fill: var(--jp-brand-color1);
+}
+
+/* special handling for splash icon CSS. While the theme CSS reloads during
+   splash, the splash icon can loose theming. To prevent that, we set a
+   default for its color variable */
+:root {
+  --jp-warn-color0: var(--md-orange-700);
+}
+
+/**
+ * (DEPRECATED) Support for icons as CSS `background-images`
+ */
+
 .jp-MaterialIcon {
   min-width: 16px;
   min-height: 16px;
@@ -95,12 +293,8 @@
   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-FilledCircleIcon {
@@ -111,10 +305,6 @@
   background-image: var(--jp-icon-filter-list);
 }
 
-.jp-FolderIcon {
-  background-image: var(--jp-icon-folder);
-}
-
 .jp-HomeIcon {
   background-image: var(--jp-icon-home);
   min-width: 16px;
@@ -123,14 +313,6 @@
   vertical-align: sub;
 }
 
-.jp-ImageIcon {
-  background-image: var(--jp-icon-image);
-}
-
-.jp-JSONIcon {
-  background-image: var(--jp-icon-json);
-}
-
 .jp-JupyterIcon {
   background-image: var(--jp-image-jupyter);
   background-size: 16px;
@@ -140,10 +322,6 @@
   padding-right: 0px;
 }
 
-.jp-KernelIcon {
-  background-image: var(--jp-icon-kernel);
-}
-
 .jp-KeyboardIcon {
   background-image: var(--jp-icon-keyboard);
 }
@@ -169,10 +347,6 @@
   width: 20px;
 }
 
-.jp-MarkdownIcon {
-  background-image: var(--jp-icon-markdown);
-}
-
 .jp-MoreHorizIcon {
   background-image: var(--jp-icon-more);
 }
@@ -181,30 +355,10 @@
   background-image: var(--jp-icon-new-folder);
 }
 
-.jp-NotebookIcon {
-  background-image: var(--jp-icon-notebook);
-}
-
-.jp-FolderIcon {
-  background-image: var(--jp-icon-folder);
-}
-
-.jp-PaletteIcon {
-  background-image: var(--jp-icon-palette);
-}
-
 .jp-PasteIcon {
   background-image: var(--jp-icon-paste);
 }
 
-.jp-PythonIcon {
-  background-image: var(--jp-icon-python);
-}
-
-.jp-RKernelIcon {
-  background-image: var(--jp-icon-r);
-}
-
 .jp-RefreshIcon {
   background-image: var(--jp-icon-refresh);
 }
@@ -213,10 +367,6 @@
   background-image: var(--jp-icon-run);
 }
 
-.jp-RunningIcon {
-  background-image: var(--jp-icon-stop-circle);
-}
-
 .jp-SaveIcon {
   background-image: var(--jp-icon-save);
 }
@@ -225,22 +375,10 @@
   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);
 }
@@ -249,14 +387,6 @@
   background-image: var(--jp-icon-undo);
 }
 
-.jp-FileUploadIcon {
-  background-image: var(--jp-icon-file-upload);
-}
-
-.jp-YAMLIcon {
-  background-image: var(--jp-icon-yaml);
-}
-
 .jp-VegaIcon {
   background-image: var(--jp-icon-vega);
 }
diff --git a/packages/application/style/images.css b/packages/application/style/images.css
index 6c966fe3036f..51cedf03ee4b 100644
--- a/packages/application/style/images.css
+++ b/packages/application/style/images.css
@@ -3,6 +3,8 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
+/* CSS for specific icons */
+
 .jp-ImageJupyterLab {
   background-image: var(--jp-image-jupyterlab);
 }
@@ -11,10 +13,6 @@
   background-image: var(--jp-image-jupyterlab-wordmark);
 }
 
-.jp-ImageJupyter-favicon {
-  background-image: var(--jp-image-jupyter-favicon);
-}
-
 .jp-JupyterIcon {
   background-image: var(--jp-image-jupyter);
   background-size: 16px;
diff --git a/packages/application/style/index.css b/packages/application/style/index.css
index 664fa92bba98..6ece208121b6 100644
--- a/packages/application/style/index.css
+++ b/packages/application/style/index.css
@@ -5,6 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
 @import url('~font-awesome/css/font-awesome.min.css');
diff --git a/packages/application/tsconfig.json b/packages/application/tsconfig.json
index 3dfa87de215c..27ada107b7cf 100644
--- a/packages/application/tsconfig.json
+++ b/packages/application/tsconfig.json
@@ -23,6 +23,9 @@
     },
     {
       "path": "../services"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/apputils-extension/package.json b/packages/apputils-extension/package.json
index 2f9ff1262af9..9dac53222948 100644
--- a/packages/apputils-extension/package.json
+++ b/packages/apputils-extension/package.json
@@ -41,6 +41,7 @@
     "@jupyterlab/apputils": "^1.1.0-alpha.1",
     "@jupyterlab/coreutils": "^3.1.0-alpha.1",
     "@jupyterlab/mainmenu": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/commands": "^1.6.3",
     "@phosphor/coreutils": "^1.3.1",
diff --git a/packages/apputils-extension/src/index.ts b/packages/apputils-extension/src/index.ts
index e447f9540b69..c07def7b84f6 100644
--- a/packages/apputils-extension/src/index.ts
+++ b/packages/apputils-extension/src/index.ts
@@ -34,6 +34,8 @@ import {
 
 import { IMainMenu } from '@jupyterlab/mainmenu';
 
+import { defaultIconRegistry } from '@jupyterlab/ui-components';
+
 import { PromiseDelegate } from '@phosphor/coreutils';
 
 import { DisposableDelegate } from '@phosphor/disposable';
@@ -291,6 +293,13 @@ const splash: JupyterFrontEndPlugin<ISplashScreen> = {
     galaxy.id = 'galaxy';
     logo.id = 'main-logo';
 
+    defaultIconRegistry.icon({
+      name: 'jupyter-favicon',
+      container: logo,
+      center: true,
+      kind: 'splash'
+    });
+
     galaxy.appendChild(logo);
     ['1', '2', '3'].forEach(id => {
       const moon = document.createElement('div');
diff --git a/packages/apputils-extension/style/images/jupyter-favicon.svg b/packages/apputils-extension/style/images/jupyter-favicon.svg
deleted file mode 100644
index 41d846fc9d5f..000000000000
--- a/packages/apputils-extension/style/images/jupyter-favicon.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="152px" height="165px" viewBox="0 0 152 165" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" fill="#F37726">
-            <g id="logo.svg">
-                <g id="Canvas">
-                    <g id="logo">
-                        <g id="g">
-                            <g id="path" transform="translate(0.000000, 109.804878)">
-                                <g id="path8-fill">
-                                    <g id="path1_fill-link" transform="translate(0.078947, 0.778049)">
-                                        <path d="M75.9422842,29.5804561 C43.3023947,29.5804561 14.7967832,17.6534634 0,0 C5.51083211,15.8406829 15.7815389,29.5667732 29.3904947,39.2784171 C42.9997,48.9898537 59.2737,54.2067805 75.9605789,54.2067805 C92.6474579,54.2067805 108.921458,48.9898537 122.530663,39.2784171 C136.139453,29.5667732 146.410284,15.8406829 151.921158,0 C137.087868,17.6534634 108.582589,29.5804561 75.9422842,29.5804561 L75.9422842,29.5804561 Z" id="path1_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                            <g id="path">
-                                <g id="path9-fill">
-                                    <g id="path2_fill-link" transform="translate(0.037368, 0.704878)">
-                                        <path d="M75.9784579,24.6264073 C108.618763,24.6264073 137.124458,36.5534415 151.921158,54.2067805 C146.410284,38.366222 136.139453,24.6401317 122.530663,14.9284878 C108.921458,5.2168439 92.6474579,0 75.9605789,0 C59.2737,0 42.9997,5.2168439 29.3904947,14.9284878 C15.7815389,24.6401317 5.51083211,38.366222 0,54.2067805 C14.8330816,36.5899293 43.3385684,24.6264073 75.9784579,24.6264073 L75.9784579,24.6264073 Z" id="path2_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/packages/apputils-extension/style/index.css b/packages/apputils-extension/style/index.css
index 39f879fb3639..0f1065092855 100644
--- a/packages/apputils-extension/style/index.css
+++ b/packages/apputils-extension/style/index.css
@@ -5,6 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/mainmenu/style/index.css');
diff --git a/packages/apputils-extension/style/splash.css b/packages/apputils-extension/style/splash.css
index c810edccd31b..891adef97267 100644
--- a/packages/apputils-extension/style/splash.css
+++ b/packages/apputils-extension/style/splash.css
@@ -33,18 +33,6 @@
   height: 100%;
 }
 
-#main-logo {
-  background-image: url('./images/jupyter-favicon.svg');
-  background-repeat: no-repeat;
-  background-size: 100px;
-  position: absolute;
-  background-position: center;
-  width: 100%;
-  height: 100%;
-  z-index: 1;
-  animation: 0.3s fade-in linear forwards;
-}
-
 .planet {
   background-repeat: no-repeat;
   background-size: cover;
diff --git a/packages/apputils-extension/tsconfig.json b/packages/apputils-extension/tsconfig.json
index 17ecbea70fb2..298728e8d135 100644
--- a/packages/apputils-extension/tsconfig.json
+++ b/packages/apputils-extension/tsconfig.json
@@ -17,6 +17,9 @@
     },
     {
       "path": "../mainmenu"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/apputils/src/domutils.ts b/packages/apputils/src/domutils.ts
index 8237b231f50f..ee14f99fdc98 100644
--- a/packages/apputils/src/domutils.ts
+++ b/packages/apputils/src/domutils.ts
@@ -34,6 +34,18 @@ export namespace DOMUtils {
     return parent.querySelector(`.${className}`) as HTMLElement;
   }
 
+  /**
+   * Find the first element matching a class name.
+   */
+  export function findElements(
+    parent: HTMLElement,
+    className: string
+  ): HTMLCollectionOf<HTMLElement> {
+    return parent.getElementsByClassName(className) as HTMLCollectionOf<
+      HTMLElement
+    >;
+  }
+
   /**
    * Create a DOM id with prefix "id-" to solve bug for UUIDs beginning with numbers.
    */
diff --git a/packages/apputils/style/index.css b/packages/apputils/style/index.css
index 9a38dcba26bc..38810a9cb009 100644
--- a/packages/apputils/style/index.css
+++ b/packages/apputils/style/index.css
@@ -4,7 +4,7 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
-@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 
 @import url('./base.css');
diff --git a/packages/codemirror-extension/src/index.ts b/packages/codemirror-extension/src/index.ts
index 16c0e1a5f3ad..f07a96c45419 100644
--- a/packages/codemirror-extension/src/index.ts
+++ b/packages/codemirror-extension/src/index.ts
@@ -71,13 +71,18 @@ const commands: JupyterFrontEndPlugin<void> = {
 export const editorSyntaxStatus: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/codemirror-extension:editor-syntax-status',
   autoStart: true,
-  requires: [IStatusBar, IEditorTracker, ILabShell],
+  requires: [IEditorTracker, ILabShell],
+  optional: [IStatusBar],
   activate: (
     app: JupyterFrontEnd,
-    statusBar: IStatusBar,
     tracker: IEditorTracker,
-    labShell: ILabShell
+    labShell: ILabShell,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     let item = new EditorSyntaxStatus({ commands: app.commands });
     labShell.currentChanged.connect(() => {
       const current = labShell.currentWidget;
diff --git a/packages/coreutils/src/path.ts b/packages/coreutils/src/path.ts
index b7ee7919dce7..db1b57d12514 100644
--- a/packages/coreutils/src/path.ts
+++ b/packages/coreutils/src/path.ts
@@ -61,6 +61,23 @@ export namespace PathExt {
     return posix.extname(path);
   }
 
+  /**
+   * Get the last portion of a path, without its extension (if any).
+   *
+   * @param path - The file path.
+   *
+   * @returns the last part of the path, sans extension.
+   */
+  export function stem(path: string): string {
+    return path
+      .split('\\')
+      .pop()
+      .split('/')
+      .pop()
+      .split('.')
+      .shift();
+  }
+
   /**
    * Normalize a string path, reducing '..' and '.' parts.
    * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
diff --git a/packages/coreutils/src/text.ts b/packages/coreutils/src/text.ts
index ef8de712b5fb..7892a1b11a7e 100644
--- a/packages/coreutils/src/text.ts
+++ b/packages/coreutils/src/text.ts
@@ -71,6 +71,29 @@ export namespace Text {
     return jsIdx;
   }
 
+  /**
+   * Given a 'snake-case', 'snake_case', or 'snake case' string,
+   * will return the camel case version: 'snakeCase'.
+   *
+   * @param str: the snake-case input string.
+   *
+   * @param upper: default = false. If true, the first letter of the
+   * returned string will be capitalized.
+   *
+   * @returns the camel case version of the input string.
+   */
+  export function camelCase(str: string, upper: boolean = false): string {
+    return str.replace(/(?:^\w|[A-Z]|\b\w|\s+|-+|_+)/g, function(match, index) {
+      if (+match === 0 || match[0] === '-') {
+        return '';
+      } else if (index === 0 && !upper) {
+        return match.toLowerCase();
+      } else {
+        return match.toUpperCase();
+      }
+    });
+  }
+
   /**
    * Given a string, title case the words in the string.
    *
diff --git a/packages/csvviewer-extension/src/index.ts b/packages/csvviewer-extension/src/index.ts
index db69d5773750..a8f21c14b66c 100644
--- a/packages/csvviewer-extension/src/index.ts
+++ b/packages/csvviewer-extension/src/index.ts
@@ -35,8 +35,13 @@ const FACTORY_TSV = 'TSVTable';
 const csv: JupyterFrontEndPlugin<void> = {
   activate: activateCsv,
   id: '@jupyterlab/csvviewer-extension:csv',
-  requires: [ILayoutRestorer, IThemeManager, IMainMenu],
-  optional: [ISearchProviderRegistry],
+  requires: [],
+  optional: [
+    ILayoutRestorer,
+    IThemeManager,
+    IMainMenu,
+    ISearchProviderRegistry
+  ],
   autoStart: true
 };
 
@@ -46,8 +51,13 @@ const csv: JupyterFrontEndPlugin<void> = {
 const tsv: JupyterFrontEndPlugin<void> = {
   activate: activateTsv,
   id: '@jupyterlab/csvviewer-extension:tsv',
-  requires: [ILayoutRestorer, IThemeManager, IMainMenu],
-  optional: [ISearchProviderRegistry],
+  requires: [],
+  optional: [
+    ILayoutRestorer,
+    IThemeManager,
+    IMainMenu,
+    ISearchProviderRegistry
+  ],
   autoStart: true
 };
 
@@ -66,7 +76,7 @@ function addMenuEntries(
         title: 'Go to Line',
         value: 0
       }).then(value => {
-        if (value.button.accept) {
+        if (value.button.accept && value.value !== null) {
           widget.content.goToLine(value.value);
         }
       });
@@ -79,10 +89,10 @@ function addMenuEntries(
  */
 function activateCsv(
   app: JupyterFrontEnd,
-  restorer: ILayoutRestorer,
-  themeManager: IThemeManager,
-  mainMenu: IMainMenu,
-  searchregistry: ISearchProviderRegistry = null
+  restorer: ILayoutRestorer | null,
+  themeManager: IThemeManager | null,
+  mainMenu: IMainMenu | null,
+  searchregistry: ISearchProviderRegistry | null
 ): void {
   const factory = new CSVViewerFactory({
     name: FACTORY_CSV,
@@ -98,12 +108,14 @@ function activateCsv(
   let style: DataGrid.IStyle = Private.LIGHT_STYLE;
   let rendererConfig: TextRenderConfig = Private.LIGHT_TEXT_CONFIG;
 
-  // Handle state restoration.
-  void restorer.restore(tracker, {
-    command: 'docmanager:open',
-    args: widget => ({ path: widget.context.path, factory: FACTORY_CSV }),
-    name: widget => widget.context.path
-  });
+  if (restorer) {
+    // Handle state restoration.
+    void restorer.restore(tracker, {
+      command: 'docmanager:open',
+      args: widget => ({ path: widget.context.path, factory: FACTORY_CSV }),
+      name: widget => widget.context.path
+    });
+  }
 
   app.docRegistry.addWidgetFactory(factory);
   let ft = app.docRegistry.getFileType('csv');
@@ -116,8 +128,8 @@ function activateCsv(
     });
 
     if (ft) {
-      widget.title.iconClass = ft.iconClass;
-      widget.title.iconLabel = ft.iconLabel;
+      widget.title.iconClass = ft.iconClass!;
+      widget.title.iconLabel = ft.iconLabel!;
     }
     // Set the theme for the new widget.
     widget.content.style = style;
@@ -126,7 +138,10 @@ function activateCsv(
 
   // Keep the themes up-to-date.
   const updateThemes = () => {
-    const isLight = themeManager.isLight(themeManager.theme);
+    const isLight =
+      themeManager && themeManager.theme
+        ? themeManager.isLight(themeManager.theme)
+        : true;
     style = isLight ? Private.LIGHT_STYLE : Private.DARK_STYLE;
     rendererConfig = isLight
       ? Private.LIGHT_TEXT_CONFIG
@@ -136,9 +151,13 @@ function activateCsv(
       grid.content.rendererConfig = rendererConfig;
     });
   };
-  themeManager.themeChanged.connect(updateThemes);
+  if (themeManager) {
+    themeManager.themeChanged.connect(updateThemes);
+  }
 
-  addMenuEntries(mainMenu, tracker);
+  if (mainMenu) {
+    addMenuEntries(mainMenu, tracker);
+  }
   if (searchregistry) {
     searchregistry.register('csv', CSVSearchProvider);
   }
@@ -149,10 +168,10 @@ function activateCsv(
  */
 function activateTsv(
   app: JupyterFrontEnd,
-  restorer: ILayoutRestorer,
-  themeManager: IThemeManager,
-  mainMenu: IMainMenu,
-  searchregistry: ISearchProviderRegistry = null
+  restorer: ILayoutRestorer | null,
+  themeManager: IThemeManager | null,
+  mainMenu: IMainMenu | null,
+  searchregistry: ISearchProviderRegistry | null
 ): void {
   const factory = new TSVViewerFactory({
     name: FACTORY_TSV,
@@ -168,12 +187,14 @@ function activateTsv(
   let style: DataGrid.IStyle = Private.LIGHT_STYLE;
   let rendererConfig: TextRenderConfig = Private.LIGHT_TEXT_CONFIG;
 
-  // Handle state restoration.
-  void restorer.restore(tracker, {
-    command: 'docmanager:open',
-    args: widget => ({ path: widget.context.path, factory: FACTORY_TSV }),
-    name: widget => widget.context.path
-  });
+  if (restorer) {
+    // Handle state restoration.
+    void restorer.restore(tracker, {
+      command: 'docmanager:open',
+      args: widget => ({ path: widget.context.path, factory: FACTORY_TSV }),
+      name: widget => widget.context.path
+    });
+  }
 
   app.docRegistry.addWidgetFactory(factory);
   let ft = app.docRegistry.getFileType('tsv');
@@ -186,8 +207,8 @@ function activateTsv(
     });
 
     if (ft) {
-      widget.title.iconClass = ft.iconClass;
-      widget.title.iconLabel = ft.iconLabel;
+      widget.title.iconClass = ft.iconClass!;
+      widget.title.iconLabel = ft.iconLabel!;
     }
     // Set the theme for the new widget.
     widget.content.style = style;
@@ -196,7 +217,10 @@ function activateTsv(
 
   // Keep the themes up-to-date.
   const updateThemes = () => {
-    const isLight = themeManager.isLight(themeManager.theme);
+    const isLight =
+      themeManager && themeManager.theme
+        ? themeManager.isLight(themeManager.theme)
+        : true;
     style = isLight ? Private.LIGHT_STYLE : Private.DARK_STYLE;
     rendererConfig = isLight
       ? Private.LIGHT_TEXT_CONFIG
@@ -206,9 +230,13 @@ function activateTsv(
       grid.content.rendererConfig = rendererConfig;
     });
   };
-  themeManager.themeChanged.connect(updateThemes);
+  if (themeManager) {
+    themeManager.themeChanged.connect(updateThemes);
+  }
 
-  addMenuEntries(mainMenu, tracker);
+  if (mainMenu) {
+    addMenuEntries(mainMenu, tracker);
+  }
   if (searchregistry) {
     searchregistry.register('tsv', CSVSearchProvider);
   }
diff --git a/packages/docmanager-extension/src/index.ts b/packages/docmanager-extension/src/index.ts
index d1fec3d07a71..0e52205b8457 100644
--- a/packages/docmanager-extension/src/index.ts
+++ b/packages/docmanager-extension/src/index.ts
@@ -167,13 +167,18 @@ const docManagerPlugin: JupyterFrontEndPlugin<IDocumentManager> = {
 export const savingStatusPlugin: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/docmanager-extension:saving-status',
   autoStart: true,
-  requires: [IStatusBar, IDocumentManager, ILabShell],
+  requires: [IDocumentManager, ILabShell],
+  optional: [IStatusBar],
   activate: (
     _: JupyterFrontEnd,
-    statusBar: IStatusBar,
     docManager: IDocumentManager,
-    labShell: ILabShell
+    labShell: ILabShell,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     const saving = new SavingStatus({ docManager });
 
     // Keep the currently active widget synchronized.
@@ -197,13 +202,18 @@ export const savingStatusPlugin: JupyterFrontEndPlugin<void> = {
 export const pathStatusPlugin: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/docmanager-extension:path-status',
   autoStart: true,
-  requires: [IStatusBar, IDocumentManager, ILabShell],
+  requires: [IDocumentManager, ILabShell],
+  optional: [IStatusBar],
   activate: (
     _: JupyterFrontEnd,
-    statusBar: IStatusBar,
     docManager: IDocumentManager,
-    labShell: ILabShell
+    labShell: ILabShell,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     const path = new PathStatus({ docManager });
 
     // Keep the file path widget up-to-date with the application active widget.
diff --git a/packages/docregistry/src/registry.ts b/packages/docregistry/src/registry.ts
index f234672f5963..cebc01a43648 100644
--- a/packages/docregistry/src/registry.ts
+++ b/packages/docregistry/src/registry.ts
@@ -1120,7 +1120,7 @@ export namespace DocumentRegistry {
     name: 'default',
     extensions: [],
     mimeTypes: [],
-    iconClass: 'jp-MaterialIcon jp-FileIcon',
+    iconClass: 'jp-FileIcon',
     iconLabel: '',
     contentType: 'file',
     fileFormat: 'text'
@@ -1171,7 +1171,7 @@ export namespace DocumentRegistry {
     extensions: ['.ipynb'],
     contentType: 'notebook',
     fileFormat: 'json',
-    iconClass: 'jp-MaterialIcon jp-NotebookIcon'
+    iconClass: 'jp-NotebookIcon'
   };
 
   /**
@@ -1183,7 +1183,7 @@ export namespace DocumentRegistry {
     extensions: [],
     mimeTypes: ['text/directory'],
     contentType: 'directory',
-    iconClass: 'jp-MaterialIcon jp-FolderIcon'
+    iconClass: 'jp-FolderIcon'
   };
 
   /**
@@ -1198,56 +1198,56 @@ export namespace DocumentRegistry {
       displayName: 'Markdown File',
       extensions: ['.md'],
       mimeTypes: ['text/markdown'],
-      iconClass: 'jp-MaterialIcon jp-MarkdownIcon'
+      iconClass: 'jp-MarkdownIcon'
     },
     {
       name: 'python',
       displayName: 'Python File',
       extensions: ['.py'],
       mimeTypes: ['text/x-python'],
-      iconClass: 'jp-MaterialIcon jp-PythonIcon'
+      iconClass: 'jp-PythonIcon'
     },
     {
       name: 'json',
       displayName: 'JSON File',
       extensions: ['.json'],
       mimeTypes: ['application/json'],
-      iconClass: 'jp-MaterialIcon jp-JSONIcon'
+      iconClass: 'jp-JsonIcon'
     },
     {
       name: 'csv',
       displayName: 'CSV File',
       extensions: ['.csv'],
       mimeTypes: ['text/csv'],
-      iconClass: 'jp-MaterialIcon jp-SpreadsheetIcon'
+      iconClass: 'jp-SpreadsheetIcon'
     },
     {
       name: 'tsv',
       displayName: 'TSV File',
       extensions: ['.tsv'],
       mimeTypes: ['text/csv'],
-      iconClass: 'jp-MaterialIcon jp-SpreadsheetIcon'
+      iconClass: 'jp-SpreadsheetIcon'
     },
     {
       name: 'r',
       displayName: 'R File',
       mimeTypes: ['text/x-rsrc'],
       extensions: ['.r'],
-      iconClass: 'jp-MaterialIcon jp-RKernelIcon'
+      iconClass: 'jp-RKernelIcon'
     },
     {
       name: 'yaml',
       displayName: 'YAML File',
       mimeTypes: ['text/x-yaml', 'text/yaml'],
       extensions: ['.yaml', '.yml'],
-      iconClass: 'jp-MaterialIcon jp-YAMLIcon'
+      iconClass: 'jp-YamlIcon'
     },
     {
       name: 'svg',
       displayName: 'Image',
       mimeTypes: ['image/svg+xml'],
       extensions: ['.svg'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     },
     {
@@ -1255,7 +1255,7 @@ export namespace DocumentRegistry {
       displayName: 'Image',
       mimeTypes: ['image/tiff'],
       extensions: ['.tif', '.tiff'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     },
     {
@@ -1263,7 +1263,7 @@ export namespace DocumentRegistry {
       displayName: 'Image',
       mimeTypes: ['image/jpeg'],
       extensions: ['.jpg', '.jpeg'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     },
     {
@@ -1271,7 +1271,7 @@ export namespace DocumentRegistry {
       displayName: 'Image',
       mimeTypes: ['image/gif'],
       extensions: ['.gif'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     },
     {
@@ -1279,7 +1279,7 @@ export namespace DocumentRegistry {
       displayName: 'Image',
       mimeTypes: ['image/png'],
       extensions: ['.png'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     },
     {
@@ -1287,7 +1287,7 @@ export namespace DocumentRegistry {
       displayName: 'Image',
       mimeTypes: ['image/bmp'],
       extensions: ['.bmp'],
-      iconClass: 'jp-MaterialIcon jp-ImageIcon',
+      iconClass: 'jp-ImageIcon',
       fileFormat: 'base64'
     }
   ];
diff --git a/packages/filebrowser-extension/package.json b/packages/filebrowser-extension/package.json
index eb2d4dded6fb..944e08b9d03c 100644
--- a/packages/filebrowser-extension/package.json
+++ b/packages/filebrowser-extension/package.json
@@ -45,6 +45,7 @@
     "@jupyterlab/mainmenu": "^1.1.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
     "@jupyterlab/statusbar": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/commands": "^1.6.3",
     "@phosphor/messaging": "^1.2.3",
diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
index 50f5b6b4db22..9ec7efe84655 100644
--- a/packages/filebrowser-extension/src/index.ts
+++ b/packages/filebrowser-extension/src/index.ts
@@ -43,6 +43,8 @@ import { Contents } from '@jupyterlab/services';
 
 import { IStatusBar } from '@jupyterlab/statusbar';
 
+import { IIconRegistry } from '@jupyterlab/ui-components';
+
 import { IIterator, map, reduce, toArray } from '@phosphor/algorithm';
 
 import { CommandRegistry } from '@phosphor/commands';
@@ -128,7 +130,7 @@ const factory: JupyterFrontEndPlugin<IFileBrowserFactory> = {
   activate: activateFactory,
   id: '@jupyterlab/filebrowser-extension:factory',
   provides: IFileBrowserFactory,
-  requires: [IDocumentManager, IStateDB]
+  requires: [IIconRegistry, IDocumentManager, IStateDB]
 };
 
 /**
@@ -155,12 +157,17 @@ const shareFile: JupyterFrontEndPlugin<void> = {
 export const fileUploadStatus: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/filebrowser-extension:file-upload-status',
   autoStart: true,
-  requires: [IStatusBar, IFileBrowserFactory],
+  requires: [IFileBrowserFactory],
+  optional: [IStatusBar],
   activate: (
     app: JupyterFrontEnd,
-    statusBar: IStatusBar,
-    browser: IFileBrowserFactory
+    browser: IFileBrowserFactory,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     const item = new FileUploadStatus({
       tracker: browser.tracker
     });
@@ -200,6 +207,7 @@ export default plugins;
  */
 function activateFactory(
   app: JupyterFrontEnd,
+  icoReg: IIconRegistry,
   docManager: IDocumentManager,
   state: IStateDB
 ): IFileBrowserFactory {
@@ -210,6 +218,7 @@ function activateFactory(
     options: IFileBrowserFactory.IOptions = {}
   ) => {
     const model = new FileBrowserModel({
+      iconRegistry: icoReg,
       manager: docManager,
       driveName: options.driveName || '',
       refreshInterval: options.refreshInterval,
diff --git a/packages/filebrowser-extension/tsconfig.json b/packages/filebrowser-extension/tsconfig.json
index ccbf069617a4..863de97f9c19 100644
--- a/packages/filebrowser-extension/tsconfig.json
+++ b/packages/filebrowser-extension/tsconfig.json
@@ -32,6 +32,9 @@
     },
     {
       "path": "../statusbar"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/filebrowser/package.json b/packages/filebrowser/package.json
index 51a41f50e91b..7f31b361607f 100644
--- a/packages/filebrowser/package.json
+++ b/packages/filebrowser/package.json
@@ -41,6 +41,7 @@
     "@jupyterlab/docregistry": "^1.1.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
     "@jupyterlab/statusbar": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/coreutils": "^1.3.1",
     "@phosphor/disposable": "^1.2.0",
diff --git a/packages/filebrowser/src/crumbs.ts b/packages/filebrowser/src/crumbs.ts
index 542677e4cbc8..7aa2989c45d1 100644
--- a/packages/filebrowser/src/crumbs.ts
+++ b/packages/filebrowser/src/crumbs.ts
@@ -17,6 +17,8 @@ import { PathExt, PageConfig } from '@jupyterlab/coreutils';
 
 import { renameFile } from '@jupyterlab/docmanager';
 
+import { defaultIconRegistry } from '@jupyterlab/ui-components';
+
 import { FileBrowserModel } from './model';
 
 /**
@@ -30,10 +32,15 @@ const MATERIAL_CLASS = 'jp-MaterialIcon';
 const BREADCRUMB_CLASS = 'jp-BreadCrumbs';
 
 /**
- * The class name added to add the folder icon for the breadcrumbs
+ * The class name for the folder icon for the breadcrumbs home
  */
 const BREADCRUMB_HOME = 'jp-FolderIcon';
 
+/**
+ * The class name for the breadcrumbs home node
+ */
+const BREADCRUMB_HOME_CLASS = 'jp-BreadCrumbs-home';
+
 /**
  * The class named associated to the ellipses icon
  */
@@ -159,7 +166,10 @@ export class BreadCrumbs extends Widget {
     // Find a valid click target.
     let node = event.target as HTMLElement;
     while (node && node !== this.node) {
-      if (node.classList.contains(BREADCRUMB_ITEM_CLASS)) {
+      if (
+        node.classList.contains(BREADCRUMB_ITEM_CLASS) ||
+        node.classList.contains(BREADCRUMB_HOME_CLASS)
+      ) {
         let index = ArrayExt.findFirstIndex(
           this._crumbs,
           value => value === node
@@ -353,7 +363,12 @@ namespace Private {
    */
   export function createCrumbs(): ReadonlyArray<HTMLElement> {
     let home = document.createElement('span');
-    home.className = `${MATERIAL_CLASS} ${BREADCRUMB_HOME} ${BREADCRUMB_ITEM_CLASS}`;
+    defaultIconRegistry.icon({
+      name: BREADCRUMB_HOME,
+      className: BREADCRUMB_HOME_CLASS,
+      container: home,
+      kind: 'breadCrumb'
+    });
     home.title = PageConfig.getOption('serverRoot') || 'Jupyter Server Root';
     let ellipsis = document.createElement('span');
     ellipsis.className =
diff --git a/packages/filebrowser/src/listing.ts b/packages/filebrowser/src/listing.ts
index ff507164f9cc..98aa5425ead6 100644
--- a/packages/filebrowser/src/listing.ts
+++ b/packages/filebrowser/src/listing.ts
@@ -20,6 +20,8 @@ import { DocumentRegistry } from '@jupyterlab/docregistry';
 
 import { Contents } from '@jupyterlab/services';
 
+import { IIconRegistry } from '@jupyterlab/ui-components';
+
 import {
   ArrayExt,
   ArrayIterator,
@@ -186,7 +188,9 @@ export class DirListing extends Widget {
    */
   constructor(options: DirListing.IOptions) {
     super({
-      node: (options.renderer || DirListing.defaultRenderer).createNode()
+      node: (options.renderer =
+        options.renderer ||
+        new DirListing.Renderer(options.model.iconRegistry)).createNode()
     });
     this.addClass(DIR_LISTING_CLASS);
     this._model = options.model;
@@ -196,7 +200,7 @@ export class DirListing extends Widget {
     this._editNode = document.createElement('input');
     this._editNode.className = EDITOR_CLASS;
     this._manager = this._model.manager;
-    this._renderer = options.renderer || DirListing.defaultRenderer;
+    this._renderer = options.renderer;
 
     const headerNode = DOMUtils.findElement(this.node, HEADER_CLASS);
     this._renderer.populateHeaderNode(headerNode);
@@ -736,11 +740,14 @@ export class DirListing extends Widget {
       content.appendChild(node);
     }
 
-    // Remove extra classes from the nodes.
+    // Remove extra classes/data from the nodes.
     nodes.forEach(item => {
       item.classList.remove(SELECTED_CLASS);
       item.classList.remove(RUNNING_CLASS);
       item.classList.remove(CUT_CLASS);
+      if (item.children[0]) {
+        delete (item.children[0] as HTMLElement).dataset.icon;
+      }
     });
 
     // Add extra classes to item nodes based on widget state.
@@ -1638,6 +1645,10 @@ export namespace DirListing {
    * The default implementation of an `IRenderer`.
    */
   export class Renderer implements IRenderer {
+    constructor(icoReg: IIconRegistry) {
+      this._iconRegistry = icoReg;
+    }
+
     /**
      * Create the DOM node for a dir listing.
      */
@@ -1757,9 +1768,23 @@ export namespace DirListing {
       let modified = DOMUtils.findElement(node, ITEM_MODIFIED_CLASS);
 
       if (fileType) {
-        icon.textContent = fileType.iconLabel || '';
-        icon.className = `${ITEM_ICON_CLASS} ${fileType.iconClass || ''}`;
+        // add icon as svg node. Can be styled using CSS
+        if (
+          !this._iconRegistry.icon({
+            name: fileType.iconClass,
+            className: ITEM_ICON_CLASS,
+            title: fileType.iconLabel,
+            container: icon,
+            center: true,
+            kind: 'listing'
+          })
+        ) {
+          // add icon as CSS background image. Can't be styled using CSS
+          icon.className = `${ITEM_ICON_CLASS} ${fileType.iconClass || ''}`;
+          icon.textContent = fileType.iconLabel || '';
+        }
       } else {
+        // use default icon as CSS background image
         icon.textContent = '';
         icon.className = ITEM_ICON_CLASS;
       }
@@ -1843,12 +1868,8 @@ export namespace DirListing {
       node.appendChild(icon);
       return node;
     }
+    _iconRegistry: IIconRegistry;
   }
-
-  /**
-   * The default `IRenderer` instance.
-   */
-  export const defaultRenderer = new Renderer();
 }
 
 /**
diff --git a/packages/filebrowser/src/model.ts b/packages/filebrowser/src/model.ts
index 8f458a0c9555..5f6392759a5c 100644
--- a/packages/filebrowser/src/model.ts
+++ b/packages/filebrowser/src/model.ts
@@ -1,6 +1,8 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
+import { showDialog, Dialog } from '@jupyterlab/apputils';
+
 import {
   IChangedArgs,
   IStateDB,
@@ -13,6 +15,8 @@ import { IDocumentManager, shouldOverwrite } from '@jupyterlab/docmanager';
 
 import { Contents, Kernel, Session } from '@jupyterlab/services';
 
+import { IIconRegistry } from '@jupyterlab/ui-components';
+
 import {
   ArrayIterator,
   each,
@@ -28,8 +32,6 @@ import { IDisposable } from '@phosphor/disposable';
 
 import { ISignal, Signal } from '@phosphor/signaling';
 
-import { showDialog, Dialog } from '@jupyterlab/apputils';
-
 /**
  * The default duration of the auto-refresh in ms
  */
@@ -68,6 +70,7 @@ export class FileBrowserModel implements IDisposable {
    * Construct a new file browser model.
    */
   constructor(options: FileBrowserModel.IOptions) {
+    this.iconRegistry = options.iconRegistry;
     this.manager = options.manager;
     this._driveName = options.driveName || '';
     let rootPath = this._driveName ? this._driveName + ':' : '';
@@ -109,6 +112,11 @@ export class FileBrowserModel implements IDisposable {
     });
   }
 
+  /**
+   * The icon registry instance used by the file browser model.
+   */
+  readonly iconRegistry: IIconRegistry;
+
   /**
    * The document manager instance used by the file browser model.
    */
@@ -637,6 +645,11 @@ export namespace FileBrowserModel {
    * An options object for initializing a file browser.
    */
   export interface IOptions {
+    /**
+     * An icon registry instance.
+     */
+    iconRegistry: IIconRegistry;
+
     /**
      * A document manager instance.
      */
@@ -650,15 +663,15 @@ export namespace FileBrowserModel {
     driveName?: string;
 
     /**
-     * An optional state database. If provided, the model will restore which
-     * folder was last opened when it is restored.
+     * The time interval for browser refreshing, in ms.
      */
-    state?: IStateDB;
+    refreshInterval?: number;
 
     /**
-     * The time interval for browser refreshing, in ms.
+     * An optional state database. If provided, the model will restore which
+     * folder was last opened when it is restored.
      */
-    refreshInterval?: number;
+    state?: IStateDB;
   }
 }
 
diff --git a/packages/filebrowser/style/base.css b/packages/filebrowser/style/base.css
index 4290aa23651e..8253a2287bb4 100644
--- a/packages/filebrowser/style/base.css
+++ b/packages/filebrowser/style/base.css
@@ -225,10 +225,7 @@
   color: limegreen;
   content: '\25CF';
   font-size: 8px;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  top: -2px;
+  position: absolute;
   left: -8px;
 }
 
@@ -256,7 +253,7 @@
   background-image: var(--jp-icon-python-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-JSONIcon {
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-JsonIcon {
   background-image: var(--jp-icon-json-selected);
 }
 
@@ -268,7 +265,7 @@
   background-image: var(--jp-icon-r-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-YAMLIcon {
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-YamlIcon {
   background-image: var(--jp-icon-yaml-selected);
 }
 
diff --git a/packages/filebrowser/style/index.css b/packages/filebrowser/style/index.css
index a04ddc3c646f..edbcab7a21dd 100644
--- a/packages/filebrowser/style/index.css
+++ b/packages/filebrowser/style/index.css
@@ -5,6 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@phosphor/dragdrop/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
diff --git a/packages/filebrowser/tsconfig.json b/packages/filebrowser/tsconfig.json
index cb06e46e40c7..19a64feeabb3 100644
--- a/packages/filebrowser/tsconfig.json
+++ b/packages/filebrowser/tsconfig.json
@@ -23,6 +23,9 @@
     },
     {
       "path": "../statusbar"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/fileeditor-extension/src/index.ts b/packages/fileeditor-extension/src/index.ts
index 2379f659544c..0454f9cf2eea 100644
--- a/packages/fileeditor-extension/src/index.ts
+++ b/packages/fileeditor-extension/src/index.ts
@@ -54,7 +54,7 @@ const EDITOR_ICON_CLASS = 'jp-MaterialIcon jp-TextEditorIcon';
 /**
  * The class name for the text editor icon from the default theme.
  */
-const MARKDOWN_ICON_CLASS = 'jp-MaterialIcon jp-MarkdownIcon';
+const MARKDOWN_ICON_CLASS = 'jp-MarkdownIcon';
 
 /**
  * The name of the factory that creates editor widgets.
@@ -114,13 +114,18 @@ const plugin: JupyterFrontEndPlugin<IEditorTracker> = {
 export const tabSpaceStatus: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/fileeditor-extension:tab-space-status',
   autoStart: true,
-  requires: [IStatusBar, IEditorTracker, ISettingRegistry],
+  requires: [IEditorTracker, ISettingRegistry],
+  optional: [IStatusBar],
   activate: (
     app: JupyterFrontEnd,
-    statusBar: IStatusBar,
     editorTracker: IEditorTracker,
-    settingRegistry: ISettingRegistry
+    settingRegistry: ISettingRegistry,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     // Create a menu for switching tabs vs spaces.
     const menu = new Menu({ commands: app.commands });
     const command = 'fileeditor:change-tabs';
diff --git a/packages/htmlviewer-extension/src/index.tsx b/packages/htmlviewer-extension/src/index.tsx
index 4d6d6ed24589..59b1876bb301 100644
--- a/packages/htmlviewer-extension/src/index.tsx
+++ b/packages/htmlviewer-extension/src/index.tsx
@@ -20,9 +20,9 @@ import {
 } from '@jupyterlab/htmlviewer';
 
 /**
- * The CSS class for an HTML5 icon.
+ * The name for an HTML5 icon.
  */
-const CSS_ICON_CLASS = 'jp-MaterialIcon jp-HTMLIcon';
+const ICON_NAME = 'html5';
 
 /**
  * Command IDs used by the plugin.
@@ -58,7 +58,7 @@ function activateHTMLViewer(
     displayName: 'HTML File',
     extensions: ['.html'],
     mimeTypes: ['text/html'],
-    iconClass: CSS_ICON_CLASS
+    iconClass: ICON_NAME
   };
   app.docRegistry.addFileType(ft);
 
@@ -98,6 +98,7 @@ function activateHTMLViewer(
       app.commands.notifyCommandChanged(CommandIDs.trustHTML);
     });
 
+    // widget.node.appendChild(HTML5Icon);
     widget.title.iconClass = ft.iconClass;
     widget.title.iconLabel = ft.iconLabel;
   });
diff --git a/packages/htmlviewer-extension/style/base.css b/packages/htmlviewer-extension/style/base.css
deleted file mode 100644
index 8ef6cabcc54a..000000000000
--- a/packages/htmlviewer-extension/style/base.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-
-/* Document icon */
-.jp-HTMLIcon {
-  background-image: url('./html5-icon.svg');
-}
diff --git a/packages/htmlviewer-extension/style/html5-icon.svg b/packages/htmlviewer-extension/style/html5-icon.svg
deleted file mode 100644
index b8b075fa046b..000000000000
--- a/packages/htmlviewer-extension/style/html5-icon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-	<title>HTML5 Logo</title>
-	<path d="M108.4 0h23v22.8h21.2V0h23v69h-23V46h-21v23h-23.2M206 23h-20.3V0h63.7v23H229v46h-23M259.5 0h24.1l14.8 24.3L313.2 0h24.1v69h-23V34.8l-16.1 24.8l-16.1-24.8v34.2h-22.6M348.7 0h23v46.2h32.6V69h-55.6"/>
-	<path fill="#e44d26" d="M107.6 471l-33-370.4h362.8l-33 370.2L255.7 512"/>
-	<path fill="#f16529" d="M256 480.5V131H404.3L376 447"/>
-	<path fill="#ebebeb" d="M142 176.3h114v45.4h-64.2l4.2 46.5h60v45.3H154.4M156.4 336.3H202l3.2 36.3 50.8 13.6v47.4l-93.2-26"/>
-	<path fill="#fff" d="M369.6 176.3H255.8v45.4h109.6M361.3 268.2H255.8v45.4h56l-5.3 59-50.7 13.6v47.2l93-25.8"/>
-</svg>
\ No newline at end of file
diff --git a/packages/htmlviewer-extension/style/index.css b/packages/htmlviewer-extension/style/index.css
index cbc7122d5fbc..32422713a5d6 100644
--- a/packages/htmlviewer-extension/style/index.css
+++ b/packages/htmlviewer-extension/style/index.css
@@ -8,5 +8,3 @@
 @import url('~@jupyterlab/docregistry/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/htmlviewer/style/index.css');
-
-@import url('./base.css');
diff --git a/packages/json-extension/style/index.css b/packages/json-extension/style/index.css
index 3a4b711feb1e..bacc5f067317 100644
--- a/packages/json-extension/style/index.css
+++ b/packages/json-extension/style/index.css
@@ -4,8 +4,8 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
-@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 
 @import url('./base.css');
diff --git a/packages/launcher/package.json b/packages/launcher/package.json
index 9a64f1aedddd..7d87d19a3445 100644
--- a/packages/launcher/package.json
+++ b/packages/launcher/package.json
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@jupyterlab/apputils": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/commands": "^1.6.3",
     "@phosphor/coreutils": "^1.3.1",
diff --git a/packages/launcher/src/index.tsx b/packages/launcher/src/index.tsx
index 4bc885919dec..021fefa89f76 100644
--- a/packages/launcher/src/index.tsx
+++ b/packages/launcher/src/index.tsx
@@ -7,6 +7,12 @@ import {
   VDomRenderer
 } from '@jupyterlab/apputils';
 
+import {
+  combineClasses,
+  DefaultIconReact,
+  defaultIconRegistry
+} from '@jupyterlab/ui-components';
+
 import {
   ArrayExt,
   ArrayIterator,
@@ -188,17 +194,31 @@ export class Launcher extends VDomRenderer<LauncherModel> {
     // Now create the sections for each category
     orderedCategories.forEach(cat => {
       const item = categories[cat][0] as ILauncher.IItemOptions;
-      let iconClass =
-        `${this._commands.iconClass(item.command, {
-          ...item.args,
-          cwd: this.cwd
-        })} ` + 'jp-Launcher-sectionIcon jp-Launcher-icon';
+      let iconClass = this._commands.iconClass(item.command, {
+        ...item.args,
+        cwd: this.cwd
+      });
       let kernel = KERNEL_CATEGORIES.indexOf(cat) > -1;
       if (cat in categories) {
         section = (
           <div className="jp-Launcher-section" key={cat}>
             <div className="jp-Launcher-sectionHeader">
-              {kernel && <div className={iconClass} />}
+              {kernel && defaultIconRegistry.contains(iconClass) ? (
+                <DefaultIconReact
+                  name={iconClass}
+                  className={''}
+                  center={true}
+                  kind={'launcherSection'}
+                />
+              ) : (
+                <div
+                  className={combineClasses(
+                    iconClass,
+                    'jp-Launcher-sectionIcon',
+                    'jp-Launcher-icon'
+                  )}
+                />
+              )}
               <h2 className="jp-Launcher-sectionTitle">{cat}</h2>
             </div>
             <div className="jp-Launcher-cardContainer">
@@ -384,6 +404,7 @@ function Card(
   };
 
   // Return the VDOM element.
+  const iconClass = kernel ? '' : commands.iconClass(command, args);
   return (
     <div
       className="jp-LauncherCard"
@@ -394,21 +415,28 @@ function Card(
       data-category={item.category || 'Other'}
       key={Private.keyProperty.get(item)}
     >
-      <div className="jp-LauncherCard-icon">
-        {item.kernelIconUrl && kernel && (
-          <img src={item.kernelIconUrl} className="jp-Launcher-kernelIcon" />
-        )}
-        {!item.kernelIconUrl && !kernel && (
-          <div
-            className={`${commands.iconClass(command, args)} jp-Launcher-icon`}
-          />
-        )}
-        {!item.kernelIconUrl && kernel && (
-          <div className="jp-LauncherCard-noKernelIcon">
-            {label[0].toUpperCase()}
-          </div>
-        )}
-      </div>
+      {kernel ? (
+        <div className="jp-LauncherCard-icon">
+          {item.kernelIconUrl ? (
+            <img src={item.kernelIconUrl} className="jp-Launcher-kernelIcon" />
+          ) : (
+            <div className="jp-LauncherCard-noKernelIcon">
+              {label[0].toUpperCase()}
+            </div>
+          )}
+        </div>
+      ) : defaultIconRegistry.contains(iconClass) ? (
+        <DefaultIconReact
+          name={iconClass}
+          className={''}
+          center={true}
+          kind={'launcherCard'}
+        />
+      ) : (
+        <div className="jp-LauncherCard-icon">
+          <div className={`${iconClass} jp-Launcher-icon`} />
+        </div>
+      )}
       <div className="jp-LauncherCard-label" title={title}>
         <p>{label}</p>
       </div>
diff --git a/packages/launcher/style/index.css b/packages/launcher/style/index.css
index 546e18daa8a5..bacc5f067317 100644
--- a/packages/launcher/style/index.css
+++ b/packages/launcher/style/index.css
@@ -5,6 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 
 @import url('./base.css');
diff --git a/packages/launcher/tsconfig.json b/packages/launcher/tsconfig.json
index 1a4f97efe5ff..58ebc16e0a36 100644
--- a/packages/launcher/tsconfig.json
+++ b/packages/launcher/tsconfig.json
@@ -8,6 +8,9 @@
   "references": [
     {
       "path": "../apputils"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
index 80baee2a34fa..dd0f3a67767c 100644
--- a/packages/metapackage/package.json
+++ b/packages/metapackage/package.json
@@ -101,6 +101,7 @@
     "@jupyterlab/tooltip": "^1.1.0-alpha.1",
     "@jupyterlab/tooltip-extension": "^1.1.0-alpha.1",
     "@jupyterlab/ui-components": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components-extension": "^1.1.0-alpha.1",
     "@jupyterlab/vdom": "^1.1.0-alpha.1",
     "@jupyterlab/vdom-extension": "^1.1.0-alpha.1",
     "@jupyterlab/vega4-extension": "^1.1.0-alpha.1",
diff --git a/packages/metapackage/tsconfig.json b/packages/metapackage/tsconfig.json
index dc0d758dfaf5..2c99cf8e1b42 100644
--- a/packages/metapackage/tsconfig.json
+++ b/packages/metapackage/tsconfig.json
@@ -213,6 +213,9 @@
     {
       "path": "../ui-components"
     },
+    {
+      "path": "../ui-components-extension"
+    },
     {
       "path": "../vdom"
     },
diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts
index e88150e6230a..2e769795de7c 100644
--- a/packages/notebook-extension/src/index.ts
+++ b/packages/notebook-extension/src/index.ts
@@ -306,12 +306,17 @@ const tools: JupyterFrontEndPlugin<INotebookTools> = {
 export const commandEditItem: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/notebook-extension:mode-status',
   autoStart: true,
-  requires: [IStatusBar, INotebookTracker],
+  requires: [INotebookTracker],
+  optional: [IStatusBar],
   activate: (
     app: JupyterFrontEnd,
-    statusBar: IStatusBar,
-    tracker: INotebookTracker
+    tracker: INotebookTracker,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     const { shell } = app;
     const item = new CommandEditStatus();
 
@@ -339,12 +344,17 @@ export const commandEditItem: JupyterFrontEndPlugin<void> = {
 export const notebookTrustItem: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/notebook-extension:trust-status',
   autoStart: true,
-  requires: [IStatusBar, INotebookTracker, ILabShell],
+  requires: [INotebookTracker],
+  optional: [IStatusBar],
   activate: (
     app: JupyterFrontEnd,
-    statusBar: IStatusBar,
-    tracker: INotebookTracker
+    tracker: INotebookTracker,
+    statusBar: IStatusBar | null
   ) => {
+    if (!statusBar) {
+      // Automatically disable if statusbar missing
+      return;
+    }
     const { shell } = app;
     const item = new NotebookTrustStatus();
 
diff --git a/packages/notebook/src/truststatus.tsx b/packages/notebook/src/truststatus.tsx
index 99d7b0d0e242..e6761424c35f 100644
--- a/packages/notebook/src/truststatus.tsx
+++ b/packages/notebook/src/truststatus.tsx
@@ -6,7 +6,7 @@ import { INotebookModel, Notebook } from '.';
 
 import { Cell } from '@jupyterlab/cells';
 
-import { IconItem } from '@jupyterlab/statusbar';
+import { DefaultIconReact } from '@jupyterlab/ui-components';
 
 import { toArray } from '@phosphor/algorithm';
 
@@ -44,8 +44,13 @@ function cellTrust(
 function NotebookTrustComponent(
   props: NotebookTrustComponent.IProps
 ): React.ReactElement<NotebookTrustComponent.IProps> {
-  const source = cellTrust(props)[1];
-  return <IconItem source={source} />;
+  if (props.allCellsTrusted) {
+    return <DefaultIconReact name="trusted" top={'2px'} kind={'statusBar'} />;
+  } else {
+    return (
+      <DefaultIconReact name="not-trusted" top={'2px'} kind={'statusBar'} />
+    );
+  }
 }
 
 /**
diff --git a/packages/notebook/style/base.css b/packages/notebook/style/base.css
index b289c121f49a..0f75309ccfac 100644
--- a/packages/notebook/style/base.css
+++ b/packages/notebook/style/base.css
@@ -19,7 +19,6 @@
 |----------------------------------------------------------------------------*/
 
 @import './toolbar.css';
-@import './status.css';
 
 /*-----------------------------------------------------------------------------
 | Notebook
diff --git a/packages/notebook/style/index.css b/packages/notebook/style/index.css
index 9927f8adda6c..7b77c736221c 100644
--- a/packages/notebook/style/index.css
+++ b/packages/notebook/style/index.css
@@ -4,8 +4,8 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
-@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@phosphor/dragdrop/style/index.css');
 @import url('~@jupyterlab/codeeditor/style/index.css');
diff --git a/packages/notebook/style/not-trusted-icon-dark.svg b/packages/notebook/style/not-trusted-icon-dark.svg
deleted file mode 100644
index 8439a93c6e70..000000000000
--- a/packages/notebook/style/not-trusted-icon-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="jp-icon-main" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.33319 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(3 3)" stroke="#EEEEEE" stroke-width="2"/>
-    <path class="jp-icon-main" d="M7.36842 0L0 7.36479" transform="translate(9.31592 9.32031)" stroke="#EEEEEE" stroke-width="2"/>
-    <path class="jp-icon-main" d="M7.36842 0L0 7.36479" transform="translate(9.31592 16.6836) scale(1 -1)" stroke="#EEEEEE" stroke-width="2"/>
-</svg>
diff --git a/packages/notebook/style/not-trusted-icon-light.svg b/packages/notebook/style/not-trusted-icon-light.svg
deleted file mode 100644
index cb63b74c2de6..000000000000
--- a/packages/notebook/style/not-trusted-icon-light.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="jp-icon-main" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.33319 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(3 3)" stroke="#333333" stroke-width="2"/>
-    <path class="jp-icon-main" d="M7.36842 0L0 7.36479" transform="translate(9.31592 9.32031)" stroke="#333333" stroke-width="2"/>
-    <path class="jp-icon-main" d="M7.36842 0L0 7.36479" transform="translate(9.31592 16.6836) scale(1 -1)" stroke="#333333" stroke-width="2"/>
-</svg>
diff --git a/packages/notebook/style/status.css b/packages/notebook/style/status.css
deleted file mode 100644
index 6a6fd3f01564..000000000000
--- a/packages/notebook/style/status.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-
-/*
- * icons for light themes
- */
-
-[data-jp-theme-light='true'] .jp-StatusItem-untrusted {
-  background-image: url('./not-trusted-icon-light.svg');
-}
-
-[data-jp-theme-light='true'] .jp-StatusItem-trusted {
-  background-image: url('./trusted-icon-light.svg');
-}
-
-/*
- * icons for dark themes
- */
-
-[data-jp-theme-light='false'] .jp-StatusItem-untrusted {
-  background-image: url('./not-trusted-icon-dark.svg');
-}
-
-[data-jp-theme-light='false'] .jp-StatusItem-trusted {
-  background-image: url('./trusted-icon-dark.svg');
-}
diff --git a/packages/notebook/style/trusted-icon-dark.svg b/packages/notebook/style/trusted-icon-dark.svg
deleted file mode 100644
index b92040c37a58..000000000000
--- a/packages/notebook/style/trusted-icon-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="jp-icon-main" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.3332 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(2 3)" stroke="#EEEEEE" stroke-width="2"/>
-    <path class="jp-icon-main" d="M2.86015 4.86535L0.726549 2.99959L0 3.63045L2.86015 6.13157L8 0.630872L7.27857 0L2.86015 4.86535Z" transform="translate(8 9.86719)" fill="#EEEEEE" stroke="#EEEEEE"/>
-</svg>
diff --git a/packages/notebook/style/trusted-icon-light.svg b/packages/notebook/style/trusted-icon-light.svg
deleted file mode 100644
index 7f4fc23bac83..000000000000
--- a/packages/notebook/style/trusted-icon-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path class="jp-icon-main" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.3332 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(2 3)" stroke="#333333" stroke-width="2"/>
-    <path class="jp-icon-main" d="M2.86015 4.86535L0.726549 2.99959L0 3.63045L2.86015 6.13157L8 0.630872L7.27857 0L2.86015 4.86535Z" transform="translate(8 9.86719)" fill="#333333" stroke="#333333"/>
-</svg>
diff --git a/packages/rendermime-extension/src/index.ts b/packages/rendermime-extension/src/index.ts
index abb205600cb8..3796135852c9 100644
--- a/packages/rendermime-extension/src/index.ts
+++ b/packages/rendermime-extension/src/index.ts
@@ -26,8 +26,8 @@ namespace CommandIDs {
  */
 const plugin: JupyterFrontEndPlugin<IRenderMimeRegistry> = {
   id: '@jupyterlab/rendermime-extension:plugin',
-  requires: [IDocumentManager],
-  optional: [ILatexTypesetter],
+  requires: [],
+  optional: [IDocumentManager, ILatexTypesetter],
   provides: IRenderMimeRegistry,
   activate: activate,
   autoStart: true
@@ -43,45 +43,49 @@ export default plugin;
  */
 function activate(
   app: JupyterFrontEnd,
-  docManager: IDocumentManager,
+  docManager: IDocumentManager | null,
   latexTypesetter: ILatexTypesetter | null
 ) {
-  app.commands.addCommand(CommandIDs.handleLink, {
-    label: 'Handle Local Link',
-    execute: args => {
-      const path = args['path'] as string | undefined | null;
-      const id = args['id'] as string | undefined | null;
-      if (!path) {
-        return;
-      }
-      // First check if the path exists on the server.
-      return docManager.services.contents
-        .get(path, { content: false })
-        .then(() => {
-          // Open the link with the default rendered widget factory,
-          // if applicable.
-          const factory = docManager.registry.defaultRenderedWidgetFactory(
-            path
-          );
-          const widget = docManager.openOrReveal(path, factory.name);
+  if (docManager) {
+    app.commands.addCommand(CommandIDs.handleLink, {
+      label: 'Handle Local Link',
+      execute: args => {
+        const path = args['path'] as string | undefined | null;
+        const id = args['id'] as string | undefined | null;
+        if (!path) {
+          return;
+        }
+        // First check if the path exists on the server.
+        return docManager.services.contents
+          .get(path, { content: false })
+          .then(() => {
+            // Open the link with the default rendered widget factory,
+            // if applicable.
+            const factory = docManager.registry.defaultRenderedWidgetFactory(
+              path
+            );
+            const widget = docManager.openOrReveal(path, factory.name);
 
-          // Handle the hash if one has been provided.
-          if (widget && id) {
-            widget.setFragment(id);
-          }
-        });
-    }
-  });
+            // Handle the hash if one has been provided.
+            if (widget && id) {
+              widget.setFragment(id);
+            }
+          });
+      }
+    });
+  }
   return new RenderMimeRegistry({
     initialFactories: standardRendererFactories,
-    linkHandler: {
-      handleLink: (node: HTMLElement, path: string, id?: string) => {
-        app.commandLinker.connectNode(node, CommandIDs.handleLink, {
-          path,
-          id
-        });
-      }
-    },
+    linkHandler: !docManager
+      ? null
+      : {
+          handleLink: (node: HTMLElement, path: string, id?: string) => {
+            app.commandLinker.connectNode(node, CommandIDs.handleLink, {
+              path,
+              id
+            });
+          }
+        },
     latexTypesetter
   });
 }
diff --git a/packages/settingeditor/package.json b/packages/settingeditor/package.json
index 62f775ef96c1..7629367600be 100644
--- a/packages/settingeditor/package.json
+++ b/packages/settingeditor/package.json
@@ -40,6 +40,7 @@
     "@jupyterlab/coreutils": "^3.1.0-alpha.1",
     "@jupyterlab/inspector": "^1.1.0-alpha.1",
     "@jupyterlab/rendermime": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/commands": "^1.6.3",
     "@phosphor/coreutils": "^1.3.1",
     "@phosphor/messaging": "^1.2.3",
diff --git a/packages/settingeditor/src/pluginlist.tsx b/packages/settingeditor/src/pluginlist.tsx
index 1f7dd5977e68..5daada29c4d2 100644
--- a/packages/settingeditor/src/pluginlist.tsx
+++ b/packages/settingeditor/src/pluginlist.tsx
@@ -5,6 +5,12 @@
 
 import { ISettingRegistry } from '@jupyterlab/coreutils';
 
+import {
+  combineClasses,
+  DefaultIconReact,
+  defaultIconRegistry
+} from '@jupyterlab/ui-components';
+
 import { Message } from '@phosphor/messaging';
 
 import { ISignal, Signal } from '@phosphor/signaling';
@@ -253,9 +259,11 @@ namespace Private {
       const { id, schema, version } = plugin;
       const itemTitle = `${schema.description}\n${id}\n${version}`;
       const image = getHint(ICON_CLASS_KEY, registry, plugin);
-      const iconClass = `jp-MaterialIcon jp-PluginList-icon${
-        image ? ' ' + image : ''
-      }`;
+      const iconClass = combineClasses(
+        image,
+        'jp-PluginList-icon',
+        'jp-MaterialIcon'
+      );
       const iconTitle = getHint(ICON_LABEL_KEY, registry, plugin);
 
       return (
@@ -265,7 +273,17 @@ namespace Private {
           key={id}
           title={itemTitle}
         >
-          <span className={iconClass} title={iconTitle} />
+          {defaultIconRegistry.contains(image) ? (
+            <DefaultIconReact
+              name={image}
+              title={iconTitle}
+              className={''}
+              tag={'span'}
+              kind={'settingsEditor'}
+            />
+          ) : (
+            <span className={iconClass} title={iconTitle} />
+          )}
           <span>{schema.title || id}</span>
         </li>
       );
diff --git a/packages/settingeditor/style/index.css b/packages/settingeditor/style/index.css
index 8e4c3c1c1782..fd84f4f05eda 100644
--- a/packages/settingeditor/style/index.css
+++ b/packages/settingeditor/style/index.css
@@ -5,6 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/codeeditor/style/index.css');
 @import url('~@jupyterlab/rendermime/style/index.css');
diff --git a/packages/settingeditor/tsconfig.json b/packages/settingeditor/tsconfig.json
index e38e704a2b31..75553a5273ab 100644
--- a/packages/settingeditor/tsconfig.json
+++ b/packages/settingeditor/tsconfig.json
@@ -20,6 +20,9 @@
     },
     {
       "path": "../rendermime"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/statusbar/package.json b/packages/statusbar/package.json
index 82f488fa2961..7dc5e6123832 100644
--- a/packages/statusbar/package.json
+++ b/packages/statusbar/package.json
@@ -35,6 +35,7 @@
     "@jupyterlab/codeeditor": "^1.1.0-alpha.1",
     "@jupyterlab/coreutils": "^3.1.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/coreutils": "^1.3.1",
     "@phosphor/disposable": "^1.2.0",
diff --git a/packages/statusbar/src/components/icon.tsx b/packages/statusbar/src/components/icon.tsx
deleted file mode 100644
index 74bcd444c583..000000000000
--- a/packages/statusbar/src/components/icon.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import * as React from 'react';
-
-import { classes, style } from 'typestyle/lib';
-
-import icon from '../style/icon';
-
-/**
- * A namespace for IconItem statics.
- */
-export namespace IconItem {
-  /**
-   * Props for an IconItem
-   */
-  export interface IProps {
-    /**
-     * A CSS class name for the icon.
-     */
-    source: string;
-  }
-}
-
-/**
- * A functional tsx component for an icon.
- */
-export function IconItem(
-  props: IconItem.IProps & React.HTMLAttributes<HTMLDivElement>
-): React.ReactElement<IconItem.IProps> {
-  const { source, className, ...rest } = props;
-  return (
-    <div className={classes(className, source, style(icon()))} {...rest} />
-  );
-}
diff --git a/packages/statusbar/src/components/index.ts b/packages/statusbar/src/components/index.ts
index 1f2699acab31..bd165a2abf5a 100644
--- a/packages/statusbar/src/components/index.ts
+++ b/packages/statusbar/src/components/index.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-export * from './icon';
 export * from './progressBar';
 export * from './text';
 export * from './group';
diff --git a/packages/statusbar/src/defaults/lineCol.tsx b/packages/statusbar/src/defaults/lineCol.tsx
index 2240c2da940c..d46425ace093 100644
--- a/packages/statusbar/src/defaults/lineCol.tsx
+++ b/packages/statusbar/src/defaults/lineCol.tsx
@@ -7,7 +7,11 @@ import { VDomRenderer, VDomModel, ReactWidget } from '@jupyterlab/apputils';
 
 import { CodeEditor } from '@jupyterlab/codeeditor';
 
-import { interactiveItem, showPopup, Popup, TextItem } from '..';
+import { DefaultIconReact } from '@jupyterlab/ui-components';
+
+import { classes } from 'typestyle/lib';
+
+import { interactiveItem, Popup, showPopup, TextItem } from '..';
 
 import {
   lineFormWrapper,
@@ -15,11 +19,11 @@ import {
   lineFormSearch,
   lineFormWrapperFocusWithin,
   lineFormCaption,
+  lineFormButtonDiv,
+  lineFormButtonIcon,
   lineFormButton
 } from '../style/lineForm';
 
-import { classes } from 'typestyle/lib';
-
 /**
  * A namespace for LineFormComponent statics.
  */
@@ -111,12 +115,14 @@ class LineFormComponent extends React.Component<
                 this._textInput = input;
               }}
             />
-
-            <input
-              type="submit"
-              className={classes(lineFormButton, 'jp-StatusItem-line-form')}
-              value=""
-            />
+            <div className={lineFormButtonDiv}>
+              <DefaultIconReact
+                name="line-form"
+                className={lineFormButtonIcon}
+                center={true}
+              />
+              <input type="submit" className={lineFormButton} value="" />
+            </div>
           </div>
           <label className={lineFormCaption}>
             Go to line number between 1 and {this.props.maxLine}
diff --git a/packages/statusbar/src/defaults/runningSessions.tsx b/packages/statusbar/src/defaults/runningSessions.tsx
index bb9e1d030947..161d15462544 100644
--- a/packages/statusbar/src/defaults/runningSessions.tsx
+++ b/packages/statusbar/src/defaults/runningSessions.tsx
@@ -13,7 +13,9 @@ import {
   SessionManager
 } from '@jupyterlab/services';
 
-import { GroupItem, IconItem, interactiveItem, TextItem } from '..';
+import { DefaultIconReact } from '@jupyterlab/ui-components';
+
+import { GroupItem, interactiveItem, TextItem } from '..';
 
 /**
  * Half spacing between subitems in a status item.
@@ -34,11 +36,16 @@ function RunningSessionsComponent(
     <GroupItem spacing={HALF_SPACING} onClick={props.handleClick}>
       <GroupItem spacing={HALF_SPACING}>
         <TextItem source={props.terminals} />
-        <IconItem source={'jp-StatusItem-terminal'} />
+        <DefaultIconReact
+          name={'terminal'}
+          left={'1px'}
+          top={'3px'}
+          kind={'statusBar'}
+        />
       </GroupItem>
       <GroupItem spacing={HALF_SPACING}>
         <TextItem source={props.kernels} />
-        <IconItem source={'jp-StatusItem-kernel'} />
+        <DefaultIconReact name={'kernel'} top={'2px'} kind={'statusBar'} />
       </GroupItem>
     </GroupItem>
   );
diff --git a/packages/statusbar/src/style/lineForm.ts b/packages/statusbar/src/style/lineForm.ts
index 0279898798f8..37b12d548034 100644
--- a/packages/statusbar/src/style/lineForm.ts
+++ b/packages/statusbar/src/style/lineForm.ts
@@ -2,6 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import { style } from 'typestyle/lib';
+import { NestedCSSProperties } from 'typestyle/lib/types';
 
 export const hoverItem = style({
   boxShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
@@ -22,21 +23,39 @@ export const lineFormCaption = style({
   color: 'var(--jp-ui-font-color0)'
 });
 
-export const lineFormButton = style({
-  color: 'white',
+export const baseLineForm: NestedCSSProperties = {
   border: 'none',
   borderRadius: '0px',
-  backgroundColor: 'var(--jp-brand-color1)',
   position: 'absolute',
+  backgroundSize: '16px',
+  backgroundRepeat: 'no-repeat',
+  backgroundPosition: 'center',
+  outline: 'none',
+  top: '0px',
+  right: '0px'
+};
+
+export const lineFormButtonDiv = style(baseLineForm, {
   top: '4px',
   right: '8px',
   height: '24px',
-  width: '12px',
   padding: '0px 12px',
-  backgroundSize: '16px',
-  backgroundRepeat: 'no-repeat',
-  backgroundPosition: 'center',
-  outline: 'none'
+  width: '12px'
+});
+
+export const lineFormButtonIcon = style(baseLineForm, {
+  backgroundColor: 'var(--jp-brand-color1)',
+  height: '100%',
+  width: '100%',
+  boxSizing: 'border-box',
+  padding: '4px 6px'
+});
+
+export const lineFormButton = style(baseLineForm, {
+  backgroundColor: 'transparent',
+  height: '100%',
+  width: '100%',
+  boxSizing: 'border-box'
 });
 
 export const lineFormWrapper = style({
diff --git a/packages/statusbar/style/base.css b/packages/statusbar/style/base.css
deleted file mode 100644
index 6625ae0e0324..000000000000
--- a/packages/statusbar/style/base.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-
-.jp-StatusItem-line-form {
-  background-image: url('./line-form.svg');
-}
-
-.jp-StatusItem-kernel {
-  background-image: var(--jp-icon-kernel);
-}
-
-.jp-StatusItem-terminal {
-  background-image: var(--jp-icon-terminal);
-}
diff --git a/packages/statusbar/style/index.css b/packages/statusbar/style/index.css
index a886fd82f4d1..dc66cab11ce0 100644
--- a/packages/statusbar/style/index.css
+++ b/packages/statusbar/style/index.css
@@ -7,5 +7,3 @@
 @import url('~@phosphor/widgets/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/codeeditor/style/index.css');
-
-@import url('./base.css');
diff --git a/packages/statusbar/tsconfig.json b/packages/statusbar/tsconfig.json
index 5ed8ed31f740..e987f4a07bdd 100644
--- a/packages/statusbar/tsconfig.json
+++ b/packages/statusbar/tsconfig.json
@@ -17,6 +17,9 @@
     },
     {
       "path": "../services"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/tabmanager-extension/package.json b/packages/tabmanager-extension/package.json
index 70614c81c175..63a7c44d98ea 100644
--- a/packages/tabmanager-extension/package.json
+++ b/packages/tabmanager-extension/package.json
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/widgets": "^1.8.0"
   },
diff --git a/packages/tabmanager-extension/src/index.ts b/packages/tabmanager-extension/src/index.ts
index f474188c97d6..bb009ca7be93 100644
--- a/packages/tabmanager-extension/src/index.ts
+++ b/packages/tabmanager-extension/src/index.ts
@@ -8,9 +8,11 @@ import {
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
 
+import { TabBarSvg } from '@jupyterlab/ui-components';
+
 import { each } from '@phosphor/algorithm';
 
-import { TabBar, Widget } from '@phosphor/widgets';
+import { Widget } from '@phosphor/widgets';
 
 /**
  * The default tab manager extension.
@@ -23,7 +25,10 @@ const plugin: JupyterFrontEndPlugin<void> = {
     restorer: ILayoutRestorer | null
   ): void => {
     const { shell } = app;
-    const tabs = new TabBar<Widget>({ orientation: 'vertical' });
+    const tabs = new TabBarSvg<Widget>({
+      kind: 'tabManager',
+      orientation: 'vertical'
+    });
     const header = document.createElement('header');
 
     if (restorer) {
diff --git a/packages/tabmanager-extension/style/base.css b/packages/tabmanager-extension/style/base.css
index cca65b840fba..4305a3551864 100644
--- a/packages/tabmanager-extension/style/base.css
+++ b/packages/tabmanager-extension/style/base.css
@@ -145,7 +145,7 @@
   background-image: var(--jp-icon-python-selected);
 }
 
-#tab-manager .p-TabBar-tab.jp-mod-active .p-TabBar-tabIcon.jp-JSONIcon {
+#tab-manager .p-TabBar-tab.jp-mod-active .p-TabBar-tabIcon.jp-JsonIcon {
   background-image: var(--jp-icon-json-selected);
 }
 
@@ -157,7 +157,7 @@
   background-image: var(--jp-icon-r-selected);
 }
 
-#tab-manager .p-TabBar-tab.jp-mod-active .p-TabBar-tabIcon.jp-YAMLIcon {
+#tab-manager .p-TabBar-tab.jp-mod-active .p-TabBar-tabIcon.jp-YamlIcon {
   background-image: var(--jp-icon-yaml-selected);
 }
 
diff --git a/packages/tabmanager-extension/style/index.css b/packages/tabmanager-extension/style/index.css
index f4505e03ab05..38810a9cb009 100644
--- a/packages/tabmanager-extension/style/index.css
+++ b/packages/tabmanager-extension/style/index.css
@@ -5,5 +5,6 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
+@import url('~@jupyterlab/ui-components/style/index.css');
 
 @import url('./base.css');
diff --git a/packages/tabmanager-extension/tsconfig.json b/packages/tabmanager-extension/tsconfig.json
index f923db8c1492..e390491760f2 100644
--- a/packages/tabmanager-extension/tsconfig.json
+++ b/packages/tabmanager-extension/tsconfig.json
@@ -8,6 +8,9 @@
   "references": [
     {
       "path": "../application"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/theme-dark-extension/style/icons/jupyter/csv.svg b/packages/theme-dark-extension/style/icons/jupyter/csv.svg
deleted file mode 100644
index 4e2fe48619b3..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/csv.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#4CAF50;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M2.2,2.2v17.6h17.6V2.2C19.8,2.2,2.2,2.2,2.2,2.2z M17.6,9.9h-5.5V4.4h5.5V9.9z M9.9,4.4v5.5H4.4V4.4
-	C4.4,4.4,9.9,4.4,9.9,4.4z M4.4,12.1h5.5v5.5H4.4L4.4,12.1z M12.1,17.6v-5.5h5.5v5.5H12.1z"/>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/file.svg b/packages/theme-dark-extension/style/icons/jupyter/file.svg
deleted file mode 100644
index c9ba7e630592..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/file.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:none;stroke:#E0E0E0;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st2{fill:#E0E0E0;}
-</style>
-<g class="st0">
-	<line class="st1" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st1" d="M21.5,11"/>
-	<path class="st1" d="M0.4,11"/>
-	<line class="st1" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st1" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st1" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st1" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st1" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st1" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st1" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st1" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st1" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st1" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st1" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st1" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st1" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st1" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st1" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st1" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st1" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st1" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st1" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st1" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st1" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st1" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st1" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st1" d="M22,22"/>
-	<path class="st1" d="M0,0"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st1" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st1" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st1" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st1" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st1" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5576 10.9998)" class="st1" width="6.2" height="6.2"/>
-	<line class="st1" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st1" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st1" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st1" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st1" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st1" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st1" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st1" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st1" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st1" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st1" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st1" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st1" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st1" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st1" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st1" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st1" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<path class="st2" d="M19.3,8.2l-5.5-5.5c-0.3-0.3-0.7-0.5-1.2-0.5H3.9C3.1,2.3,2.3,3.1,2.3,4v14.1c0,0.9,0.7,1.6,1.6,1.6h14.2
-	c0.9,0,1.6-0.7,1.6-1.6V9.4C19.8,8.9,19.6,8.5,19.3,8.2z M13.5,4.9l3.4,3.6h-3.4V4.9z M17.4,17.6l-12.7,0c-0.1,0-0.2,0-0.2-0.2V4.7
-	c0-0.2,0.1-0.3,0.2-0.3h7.2v4.4c0,0,0,0.8,0.3,1.1c0.3,0.3,1.1,0.3,1.1,0.3h4.3l0,7.2C17.6,17.4,17.5,17.6,17.4,17.6z"/>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/image.svg b/packages/theme-dark-extension/style/icons/jupyter/image.svg
deleted file mode 100644
index e519d19f8c7b..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/image.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#3F51B5;}
-	.st2{display:none;}
-	.st3{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<rect x="2.2" y="2.2" class="st0" width="17.5" height="17.5"/>
-<g>
-	<path class="st1" d="M2.2,2.2v17.5h17.5l0.1-17.5C19.8,2.2,2.2,2.2,2.2,2.2z M14.3,4.4c1.2,0,2.2,1,2.2,2.2s-1,2.2-2.2,2.2
-		s-2.2-1-2.2-2.2S13.1,4.4,14.3,4.4z M4.4,17.6l3.3-8.8l3.3,6.6l2.2-3.2l4.4,5.4H4.4z"/>
-</g>
-<g id="grid" class="st2">
-	<line class="st3" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st3" d="M21.5,11"/>
-	<path class="st3" d="M0.4,11"/>
-	<line class="st3" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st3" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st3" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st3" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st3" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st3" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st3" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st3" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st3" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st3" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st3" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st3" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st3" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st3" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st3" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st3" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st3" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st3" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st3" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st3" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st3" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st3" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st3" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st3" d="M22,22"/>
-	<path class="st3" d="M0,0"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st3" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st3" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st3" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st3" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st3" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5566 10.999)" class="st3" width="6.2" height="6.2"/>
-	<line class="st3" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st3" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st3" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st3" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st3" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st3" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st3" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st3" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st3" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st3" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st3" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st3" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st3" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st3" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st3" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st3" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st3" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/json.svg b/packages/theme-dark-extension/style/icons/jupyter/json.svg
deleted file mode 100644
index f74e30a28c7a..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/json.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F9A825;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M20.2,11.8c-1.6,0-1.7,0.5-1.7,1c0,0.4,0.1,0.9,0.1,1.3c0.1,0.5,0.1,0.9,0.1,1.3c0,1.7-1.4,2.3-3.5,2.3h-0.9
-			v-1.9h0.5c1.1,0,1.4,0,1.4-0.8c0-0.3,0-0.6-0.1-1c0-0.4-0.1-0.8-0.1-1.2c0-1.3,0-1.8,1.3-2l0,0c-1.3-0.2-1.3-0.7-1.3-2
-			c0-0.4,0.1-0.8,0.1-1.2c0.1-0.4,0.1-0.7,0.1-1c0-0.8-0.4-0.7-1.4-0.8h-0.5V4.1h0.9c2.2,0,3.5,0.7,3.5,2.3c0,0.4-0.1,0.9-0.1,1.3
-			c-0.1,0.5-0.1,0.9-0.1,1.3c0,0.5,0.2,1,1.7,1C20.2,10,20.2,11.8,20.2,11.8z"/>
-		<g>
-			<path class="st0" d="M1.8,10.1c1.6,0,1.7-0.5,1.7-1c0-0.4-0.1-0.9-0.1-1.3C3.3,7.3,3.3,6.9,3.3,6.5c0-1.6,1.4-2.3,3.5-2.3h0.9
-				v1.9H7.2c-1,0-1.4,0-1.4,0.8c0,0.3,0,0.6,0.1,1c0,0.2,0.1,0.6,0.1,1c0,1.3,0,1.8-1.3,2l0,0C6,11.2,6,11.7,6,13
-				c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.3-0.1,0.7-0.1,1C5.8,16,6.1,16,7.2,16h0.5v1.9H6.8c-2.1,0-3.5-0.6-3.5-2.3c0-0.4,0.1-0.9,0.1-1.3
-				c0.1-0.5,0.1-0.9,0.1-1.3c0-0.5-0.2-1-1.7-1V10.1z"/>
-		</g>
-	</g>
-	<circle class="st0" cx="11" cy="13.8" r="2.1"/>
-	<circle class="st0" cx="11" cy="8.2" r="2.1"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/markdown.svg b/packages/theme-dark-extension/style/icons/jupyter/markdown.svg
deleted file mode 100644
index 0762515ad838..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/markdown.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#9C27B0;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<polygon class="st0" points="5,14.9 17,14.9 10.9,20.9 "/>
-<g>
-	<path class="st0" d="M14.4,8.1c0-1.3-0.1-2.9-0.1-4.5l0,0C13.9,5,13.4,6.5,13,7.9l-1.3,4.3h-2L8.5,7.9C8.1,6.6,7.8,5,7.5,3.6l0,0
-		C7.4,5.2,7.4,6.8,7.3,8.2L7,12.4H4.8l0.7-11h3.3L10,5c0.4,1.2,0.7,2.7,1,3.9l0,0c0.3-1.2,0.7-2.6,1-3.9l1.2-3.7h3.3l0.6,11h-2.4
-		L14.4,8.1z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5576 10.9998)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/notebook.svg b/packages/theme-dark-extension/style/icons/jupyter/notebook.svg
deleted file mode 100644
index 590668f9f204..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/notebook.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:1.4;stroke-miterlimit:10;}
-	.st1{fill:#EF6C00;}
-	.st2{display:none;}
-	.st3{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M9.1,17.1"/>
-<path class="st0" d="M9.1,2.8"/>
-<path class="st0" d="M8.5,19.2"/>
-<path class="st0" d="M8.5,1.8"/>
-<path class="st1" d="M18.7,3.3v15.4H3.3V3.3H18.7 M20.2,1.8H1.8v18.3h18.3l0,0L20.2,1.8L20.2,1.8z"/>
-<g>
-	<polygon class="st1" points="16.5,16.5 11.1,12.2 5.5,16.5 5.5,5.5 16.5,5.5 	"/>
-</g>
-<g id="grid" class="st2">
-	<line class="st3" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st3" d="M21.5,11"/>
-	<path class="st3" d="M0.4,11"/>
-	<line class="st3" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st3" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st3" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st3" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st3" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st3" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st3" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st3" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st3" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st3" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st3" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st3" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st3" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st3" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st3" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st3" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st3" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st3" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st3" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st3" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st3" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st3" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st3" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st3" d="M22,22"/>
-	<path class="st3" d="M0,0"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st3" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st3" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st3" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st3" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st3" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5549 11.0015)" class="st3" width="6.2" height="6.2"/>
-	<line class="st3" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st3" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st3" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st3" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st3" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st3" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st3" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st3" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st3" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st3" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st3" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st3" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st3" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st3" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st3" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st3" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st3" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/python.svg b/packages/theme-dark-extension/style/icons/jupyter/python.svg
deleted file mode 100644
index 15857bc2210a..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/python.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2196F3;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g id="vJz2Qp.tif_1_">
-	<g>
-		<g>
-			<path class="st0" d="M11.1,6.9c0-0.2,0-1.1,0-1.1c-1.4,0-3.5,0-4.2,0c0-0.5,0-1.3,0.2-1.6c0.4-0.7,0.8-1.1,1.7-1.4
-				c1.7-0.3,2.5-0.3,3.9-0.1c1,0.1,1.9,0.9,1.9,1.9c0,1.1,0,3,0,4.2c0,0.5-0.9,1.6-2,1.6s-2.5,0-3.8,0c-1.5,0-2.4,1.4-2.4,2.8
-				c0,0.4,0,2.2,0,2.2c-0.5,0-1.2,0-1.7,0C3.5,15.1,3,14,3,13.1c0-1.3,0-2.7,0-4.1C2.9,8,3.6,7,4.8,7C6.3,6.9,11.1,6.9,11.1,6.9z"/>
-		</g>
-	</g>
-</g>
-<g id="vJz2Qp.tif_2_">
-	<g>
-		<g>
-			<path class="st0" d="M10.9,15.1c0,0.2,0,1.1,0,1.1c1.4,0,3.5,0,4.2,0c0,0.5,0,1.3-0.2,1.6c-0.4,0.7-0.8,1.1-1.7,1.4
-				c-1.7,0.3-2.5,0.3-3.9,0.1c-1-0.1-1.9-0.9-1.9-1.9c0-1.1,0-3,0-4.2c0-0.5,0.9-1.6,2-1.6s2.5,0,3.8,0c1.5,0,2.4-1.4,2.4-2.8
-				c0-0.4,0-2.2,0-2.2c0.5,0,1.2,0,1.7,0C18.5,6.9,19,8,19,8.9c0,1.3,0,2.7,0,4.1c0,1-0.7,2.1-1.9,2.1
-				C15.7,15.1,10.9,15.1,10.9,15.1z"/>
-		</g>
-	</g>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5566 10.999)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/r.svg b/packages/theme-dark-extension/style/icons/jupyter/r.svg
deleted file mode 100644
index 39af6448ea5e..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/r.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2196F3;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M4.4,2.5c1.2-0.1,2.9-0.3,4.9-0.3c2.5,0,4.1,0.4,5.2,1.3C15.5,4.2,16,5.4,16,7c0,2-1.4,3.5-2.9,4.1l0,0
-		c1.2,0.4,1.7,1.6,2.2,3c0.6,1.9,1,3.9,1.3,4.6h-3.8C12.5,18.3,12,17,11.6,15s-1.2-2.6-2.6-2.6H8.1v6.4H4.4V2.5z M8.1,9.4h1.4
-		c1.9,0,2.9-0.9,2.9-2.3s-1-2.3-2.8-2.3C8.9,4.8,8.3,4.8,8,5v4.5h0.1V9.4z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg b/packages/theme-dark-extension/style/icons/jupyter/terminal.svg
deleted file mode 100644
index 2a3fee273d68..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M180 20H20V180H180V20Z" fill="#e0e0e0"/>
-<path d="M150 127.2H110V140H150V127.2Z" fill="#424242"/>
-<path d="M68.9 145.4V134.8C61.4 134.5 54.2 132.5 50 130L53.3 117C58 119.6 64.5 121.9 71.8 121.9C78.1 121.9 82.5 119.5 82.5 115C82.5 110.8 78.9 108.1 70.7 105.3C58.8 101.3 50.7 95.7 50.7 84.9C50.7 75.1 57.6 67.4 69.5 65.1V54.6H80.4V64.4C87.9 64.7 92.9 66.3 96.5 68.1L93.3 80.7C90.4 79.5 85.3 76.9 77.3 76.9C70.1 76.9 67.7 80 67.7 83.1C67.7 86.8 71.6 89.1 81.1 92.7C94.3 97.4 99.7 103.5 99.7 113.5C99.7 123.4 92.7 131.9 79.9 134.1V145.5L68.9 145.4Z" fill="#424242"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="200" height="200" fill="#e0e0e0"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/yml.svg b/packages/theme-dark-extension/style/icons/jupyter/yml.svg
deleted file mode 100644
index 6beb3faa22c0..000000000000
--- a/packages/theme-dark-extension/style/icons/jupyter/yml.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#D81B60;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M7.2,18.6v-5.4L3,5.6h3.3l1.4,3.1c0.3,0.9,0.6,1.6,1,2.5l0,0c0.3-0.8,0.6-1.6,1-2.5l1.4-3.1h3.4l-4.4,7.6v5.5
-		L7.2,18.6L7.2,18.6z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<circle class="st0" cx="17.6" cy="16.5" r="2.1"/>
-<circle class="st0" cx="17.6" cy="11" r="2.1"/>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/md/ic_build_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_build_24px.svg
deleted file mode 100755
index 8e6558a0081e..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_build_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#E0E0E0" width="24" height="24" viewBox="0 0 24 24"><path d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/icons/md/ic_extension_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_extension_24px.svg
deleted file mode 100644
index 823656c6dd5d..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_extension_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#E0E0E0" width="24" height="24" viewBox="0 0 24 24"><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2.7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg
deleted file mode 100644
index 764399c1c042..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#e0e0e0" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg
deleted file mode 100644
index 59c09f9aa981..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#e0e0e0" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 9H9v6h6V9zm-2 4h-2v-2h2v2zm8-2V9h-2V7c0-1.1-.9-2-2-2h-2V3h-2v2h-2V3H9v2H7c-1.1 0-2 .9-2 2v2H3v2h2v2H3v2h2v2c0 1.1.9 2 2 2h2v2h2v-2h2v2h2v-2h2c1.1 0 2-.9 2-2v-2h2v-2h-2v-2h2zm-4 6H7V7h10v10z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/icons/md/ic_palette_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_palette_24px.svg
deleted file mode 100644
index 4e973a15b2a3..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_palette_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#E0E0E0" width="24" height="24" viewBox="0 0 24 24"><path d="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5 0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83.67-1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5.67 1.5 1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5.67 1.5 1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/icons/md/ic_tab_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_tab_24px.svg
deleted file mode 100644
index 685f40c5d452..000000000000
--- a/packages/theme-dark-extension/style/icons/md/ic_tab_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#E0E0E0" width="24" height="24" viewBox="0 0 24 24"><path d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h10v4h8v10z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/images/jupyter-favicon.svg b/packages/theme-dark-extension/style/images/jupyter-favicon.svg
deleted file mode 100644
index 41d846fc9d5f..000000000000
--- a/packages/theme-dark-extension/style/images/jupyter-favicon.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="152px" height="165px" viewBox="0 0 152 165" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" fill="#F37726">
-            <g id="logo.svg">
-                <g id="Canvas">
-                    <g id="logo">
-                        <g id="g">
-                            <g id="path" transform="translate(0.000000, 109.804878)">
-                                <g id="path8-fill">
-                                    <g id="path1_fill-link" transform="translate(0.078947, 0.778049)">
-                                        <path d="M75.9422842,29.5804561 C43.3023947,29.5804561 14.7967832,17.6534634 0,0 C5.51083211,15.8406829 15.7815389,29.5667732 29.3904947,39.2784171 C42.9997,48.9898537 59.2737,54.2067805 75.9605789,54.2067805 C92.6474579,54.2067805 108.921458,48.9898537 122.530663,39.2784171 C136.139453,29.5667732 146.410284,15.8406829 151.921158,0 C137.087868,17.6534634 108.582589,29.5804561 75.9422842,29.5804561 L75.9422842,29.5804561 Z" id="path1_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                            <g id="path">
-                                <g id="path9-fill">
-                                    <g id="path2_fill-link" transform="translate(0.037368, 0.704878)">
-                                        <path d="M75.9784579,24.6264073 C108.618763,24.6264073 137.124458,36.5534415 151.921158,54.2067805 C146.410284,38.366222 136.139453,24.6401317 122.530663,14.9284878 C108.921458,5.2168439 92.6474579,0 75.9605789,0 C59.2737,0 42.9997,5.2168439 29.3904947,14.9284878 C15.7815389,24.6401317 5.51083211,38.366222 0,54.2067805 C14.8330816,36.5899293 43.3385684,24.6264073 75.9784579,24.6264073 L75.9784579,24.6264073 Z" id="path2_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/packages/theme-dark-extension/style/urls.css b/packages/theme-dark-extension/style/urls.css
index f266af42ea25..fde04072bfbe 100644
--- a/packages/theme-dark-extension/style/urls.css
+++ b/packages/theme-dark-extension/style/urls.css
@@ -12,7 +12,6 @@
   --jp-image-jupyter: url('images/jupyter.svg');
   --jp-image-jupyterlab: url('images/jupyterlab.svg');
   --jp-image-jupyterlab-workmark: url('images/jupyterlab-wordmark.svg');
-  --jp-image-jupyter-favicon: url('images/jupyter-favicon.svg');
   --jp-image-caretleft: url('images/caretleft.png');
   --jp-image-caretright: url('images/caretright.png');
   --jp-image-caretup: url('images/caretup.png');
@@ -32,10 +31,7 @@
   --jp-about-header-logo: url('icons/jupyter/jupyter.svg');
   --jp-about-header-wordmark: url('images/jupyterlab-wordmark.svg');
   --jp-icon-add: url('icons/md/ic_add_24px.svg');
-  --jp-icon-notebook-selected: url('icons/jupyter/notebook_selected.svg');
-  --jp-icon-notebook: url('icons/jupyter/notebook.svg');
   --jp-icon-bug: url('icons/md/bug.svg');
-  --jp-icon-build: url('icons/md/ic_build_24px.svg');
   --jp-icon-caretdown: url('icons/md/caretdown.svg');
   --jp-icon-caretleft: url('icons/md/caretleft.svg');
   --jp-icon-caretright: url('icons/md/caretright.svg');
@@ -52,41 +48,23 @@
   --jp-icon-download: url('icons/md/download.svg');
   --jp-icon-edit: url('icons/md/edit.svg');
   --jp-icon-ellipses: url('icons/md/ellipses.svg');
-  --jp-icon-extension: url('icons/md/ic_extension_24px.svg');
   --jp-icon-file-upload: url('icons/md/ic_file_upload_24px.svg');
-  --jp-icon-file-selected: url('icons/jupyter/file_selected.svg');
-  --jp-icon-file: url('icons/jupyter/file.svg');
   --jp-icon-filter-list: url('icons/md/ic_filter_list_24px.svg');
-  --jp-icon-folder-selected: url('icons/md/ic_folder_24px_selected.svg');
-  --jp-icon-folder: url('icons/md/ic_folder_24px.svg');
   --jp-icon-home: url('icons/md/ic_home_24px.svg');
-  --jp-icon-image-selected: url('icons/jupyter/image_selected.svg');
-  --jp-icon-image: url('icons/jupyter/image.svg');
   --jp-icon-inspector: url('icons/md/baseline-web-24px.svg');
   --jp-icon-inverse-circle: url('icons/md/circle-inverse.svg');
   --jp-icon-inverse-close-circle: url('icons/md/close-circle-inverse.svg');
   --jp-icon-inverse-close: url('icons/md/close-inverse.svg');
-  --jp-icon-json-selected: url('icons/jupyter/json_selected.svg');
-  --jp-icon-json: url('icons/jupyter/json.svg');
   --jp-icon-jupyter: url('icons/jupyter/jupyter.svg');
   --jp-icon-kernel-running: url('icons/md/panorama_fish_eye.svg');
-  --jp-icon-kernel-selected: url('icons/md/ic_memory_24px_selected.svg');
-  --jp-icon-kernel: url('icons/md/ic_memory_24px.svg');
   --jp-icon-keyboard-selected: url('icons/md/ic_keyboard_24px_selected.svg');
   --jp-icon-keyboard: url('icons/md/ic_keyboard_24px.svg');
   --jp-icon-launcher-selected: url('icons/md/ic_launch_24px_selected.svg');
   --jp-icon-launcher: url('icons/md/ic_launch_24px.svg');
   --jp-icon-link: url('icons/md/link.svg');
-  --jp-icon-markdown-selected: url('icons/jupyter/markdown_selected.svg');
-  --jp-icon-markdown: url('icons/jupyter/markdown.svg');
   --jp-icon-more: url('icons/md/more-horiz.svg');
   --jp-icon-new-folder: url('icons/md/ic_create_new_folder_24px.svg');
-  --jp-icon-palette: url('icons/md/ic_palette_24px.svg');
   --jp-icon-paste: url('icons/md/paste.svg');
-  --jp-icon-python-selected: url('icons/jupyter/python_selected.svg');
-  --jp-icon-python: url('icons/jupyter/python.svg');
-  --jp-icon-r-selected: url('icons/jupyter/r_selected.svg');
-  --jp-icon-r: url('icons/jupyter/r.svg');
   --jp-icon-refresh: url('icons/md/ic_refresh_18px.svg');
   --jp-icon-run: url('icons/md/run.svg');
   --jp-icon-save: url('icons/md/save.svg');
@@ -98,16 +76,10 @@
   --jp-icon-search-regex: url('icons/jupyter/search_regex.svg');
   --jp-icon-settings-selected: url('icons/md/ic_settings_24px_selected.svg');
   --jp-icon-settings: url('icons/md/ic_settings_24px.svg');
-  --jp-icon-spreadsheet-selected: url('icons/jupyter/csv_selected.svg');
-  --jp-icon-spreadsheet: url('icons/jupyter/csv.svg');
   --jp-icon-stop: url('icons/md/stop.svg');
   --jp-icon-stop-circle: url('icons/md/stop-circle.svg');
-  --jp-icon-terminal: url('icons/jupyter/terminal.svg');
-  --jp-icon-tab: url('icons/md/ic_tab_24px.svg');
   --jp-icon-text-editor-selected: url('icons/md/ic_format_align_left_24px_selected.svg');
   --jp-icon-text-editor: url('icons/md/ic_format_align_left_24px.svg');
   --jp-icon-undo: url('icons/md/undo.svg');
   --jp-icon-vega: url('icons/jupyter/vega.svg');
-  --jp-icon-yaml-selected: url('icons/jupyter/yml_selected.svg');
-  --jp-icon-yaml: url('icons/jupyter/yml.svg');
 }
diff --git a/packages/theme-dark-extension/style/variables.css b/packages/theme-dark-extension/style/variables.css
index f04f8aa8ae34..d84eed26dfc7 100644
--- a/packages/theme-dark-extension/style/variables.css
+++ b/packages/theme-dark-extension/style/variables.css
@@ -223,6 +223,7 @@ all of MD as it is not optimized for dense, information rich UIs.
   --jp-brand-color1: var(--md-blue-500);
   --jp-brand-color2: var(--md-blue-300);
   --jp-brand-color3: var(--md-blue-100);
+  --jp-brand-color4: var(--md-blue-50);
 
   --jp-accent-color0: var(--md-green-700);
   --jp-accent-color1: var(--md-green-500);
@@ -395,4 +396,10 @@ all of MD as it is not optimized for dense, information rich UIs.
 
   --jp-scrollbar-thumb-margin: 3.5px; /* the space in between the sides of the thumb and the track */
   --jp-scrollbar-thumb-radius: 9px; /* set to a large-ish value for rounded endcaps on the thumb */
+
+  /* Icon colors that work well with light or dark backgrounds */
+  --jp-icon-contrast-color0: var(--md-purple-600);
+  --jp-icon-contrast-color1: var(--md-green-600);
+  --jp-icon-contrast-color2: var(--md-pink-600);
+  --jp-icon-contrast-color3: var(--md-blue-600);
 }
diff --git a/packages/theme-light-extension/style/icons/jupyter/csv.svg b/packages/theme-light-extension/style/icons/jupyter/csv.svg
deleted file mode 100644
index 4e2fe48619b3..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/csv.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#4CAF50;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M2.2,2.2v17.6h17.6V2.2C19.8,2.2,2.2,2.2,2.2,2.2z M17.6,9.9h-5.5V4.4h5.5V9.9z M9.9,4.4v5.5H4.4V4.4
-	C4.4,4.4,9.9,4.4,9.9,4.4z M4.4,12.1h5.5v5.5H4.4L4.4,12.1z M12.1,17.6v-5.5h5.5v5.5H12.1z"/>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/csv_selected.svg b/packages/theme-light-extension/style/icons/jupyter/csv_selected.svg
deleted file mode 100644
index 86a186363bdb..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/csv_selected.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M2.2,2.2l0,17.6h17.6l0-17.6H2.2z M17.6,9.9h-5.5V4.4l5.5,0V9.9z M9.9,4.4v5.5H4.4l0-5.5H9.9z M4.4,12.1h5.5
-	v5.5l-5.5,0L4.4,12.1z M12.1,17.6l0-5.5h5.5v5.5H12.1z"/>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5549 11.0015)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/file.svg b/packages/theme-light-extension/style/icons/jupyter/file.svg
deleted file mode 100644
index a3a2bd6c1e89..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/file.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:none;stroke:#616161;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st2{fill:#616161;}
-</style>
-<g class="st0">
-	<line class="st1" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st1" d="M21.5,11"/>
-	<path class="st1" d="M0.4,11"/>
-	<line class="st1" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st1" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st1" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st1" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st1" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st1" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st1" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st1" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st1" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st1" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st1" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st1" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st1" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st1" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st1" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st1" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st1" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st1" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st1" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st1" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st1" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st1" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st1" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st1" d="M22,22"/>
-	<path class="st1" d="M0,0"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st1" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st1" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st1" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st1" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st1" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5576 10.9998)" class="st1" width="6.2" height="6.2"/>
-	<line class="st1" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st1" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st1" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st1" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st1" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st1" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st1" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st1" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st1" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st1" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st1" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st1" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st1" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st1" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st1" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st1" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st1" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<path class="st2" d="M19.3,8.2l-5.5-5.5c-0.3-0.3-0.7-0.5-1.2-0.5H3.9C3.1,2.3,2.3,3.1,2.3,4v14.1c0,0.9,0.7,1.6,1.6,1.6h14.2
-	c0.9,0,1.6-0.7,1.6-1.6V9.4C19.8,8.9,19.6,8.5,19.3,8.2z M13.5,4.9l3.4,3.6h-3.4V4.9z M17.4,17.6l-12.7,0c-0.1,0-0.2,0-0.2-0.2V4.7
-	c0-0.2,0.1-0.3,0.2-0.3h7.2v4.4c0,0,0,0.8,0.3,1.1c0.3,0.3,1.1,0.3,1.1,0.3h4.3l0,7.2C17.6,17.4,17.5,17.6,17.4,17.6z"/>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/file_selected.svg b/packages/theme-light-extension/style/icons/jupyter/file_selected.svg
deleted file mode 100644
index fb5d739b988e..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/file_selected.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g class="st0">
-	<line class="st1" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st1" d="M21.5,11"/>
-	<path class="st1" d="M0.4,11"/>
-	<line class="st1" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st1" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st1" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st1" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st1" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st1" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st1" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st1" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st1" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st1" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st1" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st1" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st1" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st1" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st1" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st1" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st1" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st1" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st1" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st1" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st1" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st1" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st1" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st1" d="M22,22"/>
-	<path class="st1" d="M0,0"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st1" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st1" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st1" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st1" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st1" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st1" width="6.2" height="6.2"/>
-	<line class="st1" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st1" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st1" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st1" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st1" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st1" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st1" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st1" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st1" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st1" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st1" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st1" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st1" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st1" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st1" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st1" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st1" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<path class="st2" d="M19.3,8.2l-5.5-5.5c-0.3-0.3-0.7-0.5-1.2-0.5H3.9C3.1,2.3,2.3,3.1,2.3,4v14.1c0,0.9,0.7,1.6,1.6,1.6h14.2
-	c0.9,0,1.6-0.7,1.6-1.6V9.4C19.8,8.9,19.6,8.5,19.3,8.2z M13.5,4.9l3.4,3.6h-3.4V4.9z M17.4,17.6l-12.7,0c-0.1,0-0.2,0-0.2-0.2V4.7
-	c0-0.2,0.1-0.3,0.2-0.3h7.2v4.4c0,0,0,0.8,0.3,1.1c0.3,0.3,1.1,0.3,1.1,0.3h4.3l0,7.2C17.6,17.4,17.5,17.6,17.4,17.6z"/>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/image.svg b/packages/theme-light-extension/style/icons/jupyter/image.svg
deleted file mode 100644
index e519d19f8c7b..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/image.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#3F51B5;}
-	.st2{display:none;}
-	.st3{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<rect x="2.2" y="2.2" class="st0" width="17.5" height="17.5"/>
-<g>
-	<path class="st1" d="M2.2,2.2v17.5h17.5l0.1-17.5C19.8,2.2,2.2,2.2,2.2,2.2z M14.3,4.4c1.2,0,2.2,1,2.2,2.2s-1,2.2-2.2,2.2
-		s-2.2-1-2.2-2.2S13.1,4.4,14.3,4.4z M4.4,17.6l3.3-8.8l3.3,6.6l2.2-3.2l4.4,5.4H4.4z"/>
-</g>
-<g id="grid" class="st2">
-	<line class="st3" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st3" d="M21.5,11"/>
-	<path class="st3" d="M0.4,11"/>
-	<line class="st3" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st3" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st3" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st3" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st3" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st3" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st3" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st3" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st3" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st3" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st3" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st3" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st3" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st3" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st3" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st3" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st3" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st3" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st3" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st3" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st3" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st3" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st3" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st3" d="M22,22"/>
-	<path class="st3" d="M0,0"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st3" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st3" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st3" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st3" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st3" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5566 10.999)" class="st3" width="6.2" height="6.2"/>
-	<line class="st3" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st3" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st3" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st3" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st3" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st3" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st3" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st3" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st3" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st3" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st3" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st3" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st3" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st3" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st3" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st3" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st3" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/image_selected.svg b/packages/theme-light-extension/style/icons/jupyter/image_selected.svg
deleted file mode 100644
index 35194a6e0ea3..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/image_selected.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M2.2,2.2v17.5h17.5l0.1-17.5H2.2z M14.3,4.4c1.2,0,2.2,1,2.2,2.2s-1,2.2-2.2,2.2s-2.2-1-2.2-2.2
-		S13.1,4.4,14.3,4.4z M4.4,17.6l3.3-8.8l3.3,6.6l2.2-3.2l4.4,5.4H4.4z"/>
-</g>
-<g id="grid" class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5566 10.999)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/json.svg b/packages/theme-light-extension/style/icons/jupyter/json.svg
deleted file mode 100644
index f74e30a28c7a..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/json.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F9A825;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M20.2,11.8c-1.6,0-1.7,0.5-1.7,1c0,0.4,0.1,0.9,0.1,1.3c0.1,0.5,0.1,0.9,0.1,1.3c0,1.7-1.4,2.3-3.5,2.3h-0.9
-			v-1.9h0.5c1.1,0,1.4,0,1.4-0.8c0-0.3,0-0.6-0.1-1c0-0.4-0.1-0.8-0.1-1.2c0-1.3,0-1.8,1.3-2l0,0c-1.3-0.2-1.3-0.7-1.3-2
-			c0-0.4,0.1-0.8,0.1-1.2c0.1-0.4,0.1-0.7,0.1-1c0-0.8-0.4-0.7-1.4-0.8h-0.5V4.1h0.9c2.2,0,3.5,0.7,3.5,2.3c0,0.4-0.1,0.9-0.1,1.3
-			c-0.1,0.5-0.1,0.9-0.1,1.3c0,0.5,0.2,1,1.7,1C20.2,10,20.2,11.8,20.2,11.8z"/>
-		<g>
-			<path class="st0" d="M1.8,10.1c1.6,0,1.7-0.5,1.7-1c0-0.4-0.1-0.9-0.1-1.3C3.3,7.3,3.3,6.9,3.3,6.5c0-1.6,1.4-2.3,3.5-2.3h0.9
-				v1.9H7.2c-1,0-1.4,0-1.4,0.8c0,0.3,0,0.6,0.1,1c0,0.2,0.1,0.6,0.1,1c0,1.3,0,1.8-1.3,2l0,0C6,11.2,6,11.7,6,13
-				c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.3-0.1,0.7-0.1,1C5.8,16,6.1,16,7.2,16h0.5v1.9H6.8c-2.1,0-3.5-0.6-3.5-2.3c0-0.4,0.1-0.9,0.1-1.3
-				c0.1-0.5,0.1-0.9,0.1-1.3c0-0.5-0.2-1-1.7-1V10.1z"/>
-		</g>
-	</g>
-	<circle class="st0" cx="11" cy="13.8" r="2.1"/>
-	<circle class="st0" cx="11" cy="8.2" r="2.1"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/json_selected.svg b/packages/theme-light-extension/style/icons/jupyter/json_selected.svg
deleted file mode 100644
index 7d71e3a4ead0..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/json_selected.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g class="st0">
-	<line class="st1" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st1" d="M21.5,11"/>
-	<path class="st1" d="M0.4,11"/>
-	<line class="st1" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st1" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st1" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st1" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st1" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st1" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st1" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st1" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st1" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st1" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st1" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st1" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st1" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st1" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st1" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st1" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st1" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st1" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st1" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st1" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st1" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st1" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st1" d="M22,22"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st1" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st1" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st1" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st1" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st1" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st1" width="6.2" height="6.2"/>
-	<line class="st1" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st1" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st1" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st1" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st1" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st1" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st1" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st1" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st1" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st1" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st1" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st1" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st1" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st1" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st1" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st1" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<g>
-	<g>
-		<path class="st2" d="M20.2,11.8c-1.6,0-1.7,0.5-1.7,1c0,0.4,0.1,0.9,0.1,1.3c0.1,0.5,0.1,0.9,0.1,1.3c0,1.7-1.4,2.3-3.5,2.3h-0.9
-			v-1.9h0.5c1.1,0,1.4,0,1.4-0.8c0-0.3,0-0.6-0.1-1c0-0.4-0.1-0.8-0.1-1.2c0-1.3,0-1.8,1.3-2l0,0c-1.3-0.2-1.3-0.7-1.3-2
-			c0-0.4,0.1-0.8,0.1-1.2c0.1-0.4,0.1-0.7,0.1-1c0-0.8-0.4-0.7-1.4-0.8h-0.5V4.1h0.9c2.2,0,3.5,0.7,3.5,2.3c0,0.4-0.1,0.9-0.1,1.3
-			c-0.1,0.5-0.1,0.9-0.1,1.3c0,0.5,0.2,1,1.7,1C20.2,10,20.2,11.8,20.2,11.8z"/>
-		<g>
-			<path class="st2" d="M1.8,10.1c1.6,0,1.7-0.5,1.7-1c0-0.4-0.1-0.9-0.1-1.3C3.3,7.3,3.3,6.9,3.3,6.5c0-1.6,1.4-2.3,3.5-2.3h0.9
-				v1.9H7.2c-1,0-1.4,0-1.4,0.8c0,0.3,0,0.6,0.1,1c0,0.2,0.1,0.6,0.1,1c0,1.3,0,1.8-1.3,2l0,0C6,11.2,6,11.7,6,13
-				c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.3-0.1,0.7-0.1,1C5.8,16,6.1,16,7.2,16h0.5v1.9H6.8c-2.1,0-3.5-0.6-3.5-2.3c0-0.4,0.1-0.9,0.1-1.3
-				c0.1-0.5,0.1-0.9,0.1-1.3c0-0.5-0.2-1-1.7-1V10.1z"/>
-		</g>
-	</g>
-	<circle class="st2" cx="11" cy="13.8" r="2.1"/>
-	<circle class="st2" cx="11" cy="8.2" r="2.1"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/markdown.svg b/packages/theme-light-extension/style/icons/jupyter/markdown.svg
deleted file mode 100644
index 9db0a218528a..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/markdown.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#7B1FA2;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<polygon class="st0" points="5,14.9 17,14.9 10.9,20.9 "/>
-<g>
-	<path class="st0" d="M14.4,8.1c0-1.3-0.1-2.9-0.1-4.5l0,0C13.9,5,13.4,6.5,13,7.9l-1.3,4.3h-2L8.5,7.9C8.1,6.6,7.8,5,7.5,3.6l0,0
-		C7.4,5.2,7.4,6.8,7.3,8.2L7,12.4H4.8l0.7-11h3.3L10,5c0.4,1.2,0.7,2.7,1,3.9l0,0c0.3-1.2,0.7-2.6,1-3.9l1.2-3.7h3.3l0.6,11h-2.4
-		L14.4,8.1z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/markdown_selected.svg b/packages/theme-light-extension/style/icons/jupyter/markdown_selected.svg
deleted file mode 100644
index 5b1f42a30a7a..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/markdown_selected.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<polygon class="st0" points="5,14.9 17,14.9 10.9,20.9 "/>
-<g>
-	<path class="st0" d="M14.4,8.1c0-1.3-0.1-2.9-0.1-4.5l0,0C13.9,5,13.4,6.5,13,7.9l-1.3,4.3h-2L8.5,7.9C8.1,6.6,7.8,5,7.5,3.6l0,0
-		C7.4,5.2,7.4,6.8,7.3,8.2L7,12.4H4.8l0.7-11h3.3L10,5c0.4,1.2,0.7,2.7,1,3.9l0,0C11.3,7.7,11.7,6.3,12,5l1.2-3.7h3.3l0.6,11h-2.4
-		L14.4,8.1z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5549 11.0015)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/notebook.svg b/packages/theme-light-extension/style/icons/jupyter/notebook.svg
deleted file mode 100644
index 590668f9f204..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/notebook.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:1.4;stroke-miterlimit:10;}
-	.st1{fill:#EF6C00;}
-	.st2{display:none;}
-	.st3{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M9.1,17.1"/>
-<path class="st0" d="M9.1,2.8"/>
-<path class="st0" d="M8.5,19.2"/>
-<path class="st0" d="M8.5,1.8"/>
-<path class="st1" d="M18.7,3.3v15.4H3.3V3.3H18.7 M20.2,1.8H1.8v18.3h18.3l0,0L20.2,1.8L20.2,1.8z"/>
-<g>
-	<polygon class="st1" points="16.5,16.5 11.1,12.2 5.5,16.5 5.5,5.5 16.5,5.5 	"/>
-</g>
-<g id="grid" class="st2">
-	<line class="st3" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st3" d="M21.5,11"/>
-	<path class="st3" d="M0.4,11"/>
-	<line class="st3" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st3" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st3" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st3" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st3" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st3" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st3" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st3" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st3" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st3" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st3" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st3" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st3" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st3" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st3" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st3" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st3" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st3" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st3" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st3" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st3" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st3" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st3" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st3" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st3" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st3" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st3" d="M22,22"/>
-	<path class="st3" d="M0,0"/>
-	<line class="st3" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st3" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st3" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st3" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st3" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st3" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5549 11.0015)" class="st3" width="6.2" height="6.2"/>
-	<line class="st3" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st3" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st3" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st3" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st3" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st3" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st3" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st3" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st3" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st3" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st3" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st3" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st3" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st3" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st3" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st3" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st3" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st3" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/notebook_selected.svg b/packages/theme-light-extension/style/icons/jupyter/notebook_selected.svg
deleted file mode 100644
index 83b0e8cab14e..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/notebook_selected.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:1.4;stroke-miterlimit:10;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st3{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M9.1,17.1"/>
-<path class="st0" d="M9.1,2.8"/>
-<path class="st0" d="M8.5,19.2"/>
-<path class="st0" d="M8.5,1.8"/>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<path class="st3" d="M18.7,3.3v15.4H3.3V3.3H18.7 M20.2,1.8H1.8v18.3h18.3l0,0L20.2,1.8L20.2,1.8z"/>
-<g>
-	<polygon class="st3" points="16.5,16.5 11.1,12.2 5.5,16.5 5.5,5.5 16.5,5.5 	"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/python.svg b/packages/theme-light-extension/style/icons/jupyter/python.svg
deleted file mode 100644
index 944210ee9325..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/python.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0D47A1;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g id="vJz2Qp.tif_1_">
-	<g>
-		<g>
-			<path class="st0" d="M11.1,6.9c0-0.2,0-1.1,0-1.1c-1.4,0-3.5,0-4.2,0c0-0.5,0-1.3,0.2-1.6c0.4-0.7,0.8-1.1,1.7-1.4
-				c1.7-0.3,2.5-0.3,3.9-0.1c1,0.1,1.9,0.9,1.9,1.9c0,1.1,0,3,0,4.2c0,0.5-0.9,1.6-2,1.6s-2.5,0-3.8,0c-1.5,0-2.4,1.4-2.4,2.8
-				c0,0.4,0,2.2,0,2.2c-0.5,0-1.2,0-1.7,0C3.5,15.1,3,14,3,13.1c0-1.3,0-2.7,0-4.1C2.9,8,3.6,7,4.8,7C6.3,6.9,11.1,6.9,11.1,6.9z"/>
-		</g>
-	</g>
-</g>
-<g id="vJz2Qp.tif_2_">
-	<g>
-		<g>
-			<path class="st0" d="M10.9,15.1c0,0.2,0,1.1,0,1.1c1.4,0,3.5,0,4.2,0c0,0.5,0,1.3-0.2,1.6c-0.4,0.7-0.8,1.1-1.7,1.4
-				c-1.7,0.3-2.5,0.3-3.9,0.1c-1-0.1-1.9-0.9-1.9-1.9c0-1.1,0-3,0-4.2c0-0.5,0.9-1.6,2-1.6s2.5,0,3.8,0c1.5,0,2.4-1.4,2.4-2.8
-				c0-0.4,0-2.2,0-2.2c0.5,0,1.2,0,1.7,0C18.5,6.9,19,8,19,8.9c0,1.3,0,2.7,0,4.1c0,1-0.7,2.1-1.9,2.1
-				C15.7,15.1,10.9,15.1,10.9,15.1z"/>
-		</g>
-	</g>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5576 10.9998)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/python_selected.svg b/packages/theme-light-extension/style/icons/jupyter/python_selected.svg
deleted file mode 100644
index 05e29a2f320b..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/python_selected.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g id="vJz2Qp.tif_1_">
-	<g>
-		<g>
-			<path class="st0" d="M11.1,6.9c0-0.2,0-1.1,0-1.1c-1.4,0-3.5,0-4.2,0c0-0.5,0-1.3,0.2-1.6c0.4-0.7,0.8-1.1,1.7-1.4
-				c1.7-0.3,2.5-0.3,3.9-0.1c1,0.1,1.9,0.9,1.9,1.9c0,1.1,0,3,0,4.2c0,0.5-0.9,1.6-2,1.6c-1.1,0-2.5,0-3.8,0c-1.5,0-2.4,1.4-2.4,2.8
-				c0,0.4,0,2.2,0,2.2c-0.5,0-1.2,0-1.7,0c-1.2-0.3-1.7-1.4-1.7-2.3c0-1.3,0-2.7,0-4.1C2.9,8,3.6,7,4.8,7C6.3,6.9,11.1,6.9,11.1,6.9
-				z"/>
-		</g>
-	</g>
-</g>
-<g id="vJz2Qp.tif_2_">
-	<g>
-		<g>
-			<path class="st0" d="M10.9,15.1c0,0.2,0,1.1,0,1.1c1.4,0,3.5,0,4.2,0c0,0.5,0,1.3-0.2,1.6c-0.4,0.7-0.8,1.1-1.7,1.4
-				c-1.7,0.3-2.5,0.3-3.9,0.1c-1-0.1-1.9-0.9-1.9-1.9c0-1.1,0-3,0-4.2c0-0.5,0.9-1.6,2-1.6c1.1,0,2.5,0,3.8,0c1.5,0,2.4-1.4,2.4-2.8
-				c0-0.4,0-2.2,0-2.2c0.5,0,1.2,0,1.7,0c1.2,0.3,1.7,1.4,1.7,2.3c0,1.3,0,2.7,0,4.1c0,1-0.7,2.1-1.9,2.1
-				C15.7,15.1,10.9,15.1,10.9,15.1z"/>
-		</g>
-	</g>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/r.svg b/packages/theme-light-extension/style/icons/jupyter/r.svg
deleted file mode 100644
index 39af6448ea5e..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/r.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2196F3;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M4.4,2.5c1.2-0.1,2.9-0.3,4.9-0.3c2.5,0,4.1,0.4,5.2,1.3C15.5,4.2,16,5.4,16,7c0,2-1.4,3.5-2.9,4.1l0,0
-		c1.2,0.4,1.7,1.6,2.2,3c0.6,1.9,1,3.9,1.3,4.6h-3.8C12.5,18.3,12,17,11.6,15s-1.2-2.6-2.6-2.6H8.1v6.4H4.4V2.5z M8.1,9.4h1.4
-		c1.9,0,2.9-0.9,2.9-2.3s-1-2.3-2.8-2.3C8.9,4.8,8.3,4.8,8,5v4.5h0.1V9.4z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/r_selected.svg b/packages/theme-light-extension/style/icons/jupyter/r_selected.svg
deleted file mode 100644
index 0d03d9f17922..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/r_selected.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M4.4,2.5c1.2-0.1,2.9-0.3,4.9-0.3c2.5,0,4.1,0.4,5.2,1.3C15.5,4.2,16,5.4,16,7c0,2-1.4,3.5-2.9,4.1l0,0
-		c1.2,0.4,1.7,1.6,2.2,3c0.6,1.9,1,3.9,1.3,4.6h-3.8C12.5,18.3,12,17,11.6,15c-0.4-2-1.2-2.6-2.6-2.6H8.1v6.4H4.4V2.5z M8.1,9.4h1.4
-		c1.9,0,2.9-0.9,2.9-2.3s-1-2.3-2.8-2.3C8.9,4.8,8.3,4.8,8,5v4.5H8.1z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5549 11.0015)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/terminal.svg b/packages/theme-light-extension/style/icons/jupyter/terminal.svg
deleted file mode 100644
index ba743b472a00..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/terminal.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#424242;}
-	.st1{fill:#FFFFFF;}
-	.st2{display:none;}
-	.st3{display:inline;fill:none;stroke:#9E9E9E;stroke-width:0.25;stroke-miterlimit:10;}
-</style>
-<g id="Layer_1_1_">
-	<rect x="20" y="20" class="st0" width="160" height="160"/>
-</g>
-<rect x="110" y="127.2" class="st1" width="40" height="12.8"/>
-<g>
-	<path class="st1" d="M68.9,145.4v-10.6c-7.5-0.3-14.7-2.3-18.9-4.8l3.3-13c4.7,2.6,11.2,4.9,18.5,4.9c6.3,0,10.7-2.4,10.7-6.9
-		c0-4.2-3.6-6.9-11.8-9.7c-11.9-4-20-9.6-20-20.4c0-9.8,6.9-17.5,18.8-19.8V54.6h10.9v9.8c7.5,0.3,12.5,1.9,16.1,3.7l-3.2,12.6
-		c-2.9-1.2-8-3.8-16-3.8c-7.2,0-9.6,3.1-9.6,6.2c0,3.7,3.9,6,13.4,9.6c13.2,4.7,18.6,10.8,18.6,20.8c0,9.9-7,18.4-19.8,20.6v11.4
-		L68.9,145.4L68.9,145.4z"/>
-</g>
-<g class="st2">
-	<line class="st3" x1="100" y1="0" x2="100" y2="200"/>
-	<path class="st3" d="M195.9,100"/>
-	<path class="st3" d="M4,100"/>
-	<line class="st3" x1="0" y1="200" x2="200" y2="0"/>
-	<line class="st3" x1="100" y1="0" x2="200" y2="100"/>
-	<line class="st3" x1="0" y1="100" x2="100" y2="199.9"/>
-	<line class="st3" x1="200" y1="100" x2="100" y2="200"/>
-	<line class="st3" x1="100" y1="0.1" x2="0" y2="100"/>
-	<line class="st3" x1="130" y1="0" x2="130" y2="200"/>
-	<line class="st3" x1="70" y1="0" x2="70" y2="200"/>
-	<line class="st3" x1="30" y1="0" x2="30" y2="200"/>
-	<line class="st3" x1="170" y1="0" x2="170" y2="200"/>
-	<line class="st3" x1="200" y1="100" x2="0" y2="100"/>
-	<line class="st3" x1="200" y1="130" x2="0" y2="130"/>
-	<line class="st3" x1="200" y1="70" x2="0" y2="70"/>
-	<line class="st3" x1="200" y1="30" x2="0" y2="30"/>
-	<line class="st3" x1="200" y1="170" x2="0" y2="170"/>
-	<line class="st3" x1="20" y1="0.1" x2="20" y2="200.1"/>
-	<line class="st3" x1="180" y1="0" x2="180" y2="200"/>
-	<line class="st3" x1="0" y1="180" x2="200" y2="180"/>
-	<line class="st3" x1="0" y1="20" x2="200" y2="20"/>
-	<line class="st3" x1="160" y1="0" x2="160" y2="200"/>
-	<line class="st3" x1="100" y1="15" x2="185" y2="100"/>
-	<line class="st3" x1="15" y1="100" x2="100" y2="185"/>
-	<line class="st3" x1="185" y1="100" x2="100" y2="185"/>
-	<line class="st3" x1="100" y1="15" x2="15" y2="100"/>
-	<line class="st3" x1="0" y1="0" x2="200" y2="200"/>
-	<line class="st3" x1="60" y1="0" x2="60" y2="200"/>
-	<line class="st3" x1="140" y1="0" x2="140" y2="200"/>
-	<line class="st3" x1="0" y1="140" x2="200" y2="140"/>
-	<line class="st3" x1="0" y1="60" x2="200" y2="60"/>
-	<line class="st3" x1="190" y1="200" x2="0" y2="10"/>
-	<line class="st3" x1="10" y1="0" x2="200" y2="190"/>
-	<path class="st3" d="M200,200"/>
-	<path class="st3" d="M0,0"/>
-	<line class="st3" x1="190" y1="200" x2="0" y2="10"/>
-	<line class="st3" x1="10" y1="0" x2="200" y2="190"/>
-	<line class="st3" x1="0" y1="190" x2="190" y2="0"/>
-	<line class="st3" x1="200" y1="10" x2="10" y2="200"/>
-	<line class="st3" x1="40" y1="0" x2="40" y2="200"/>
-	<line class="st3" x1="200" y1="160" x2="0" y2="160"/>
-	<line class="st3" x1="200" y1="40" x2="0" y2="40"/>
-	
-		<rect x="71.7" y="71.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -41.4167 100.0406)" class="st3" width="56.7" height="56.7"/>
-	<line class="st3" x1="0" y1="150" x2="200" y2="150"/>
-	<line class="st3" x1="150" y1="200" x2="150" y2="0"/>
-	<line class="st3" x1="50" y1="200" x2="50" y2="0"/>
-	<line class="st3" x1="200" y1="50" x2="0" y2="50"/>
-	<line class="st3" x1="110" y1="0" x2="110" y2="200"/>
-	<line class="st3" x1="120" y1="0" x2="120" y2="200"/>
-	<line class="st3" x1="80" y1="200" x2="80" y2="0"/>
-	<line class="st3" x1="90" y1="200" x2="90" y2="0"/>
-	<line class="st3" x1="0" y1="70" x2="200" y2="70"/>
-	<line class="st3" x1="0" y1="130" x2="200" y2="130"/>
-	<line class="st3" x1="0" y1="90" x2="200" y2="90"/>
-	<line class="st3" x1="0" y1="80" x2="200" y2="80"/>
-	<line class="st3" x1="200" y1="120" x2="0" y2="120"/>
-	<line class="st3" x1="200" y1="110" x2="0" y2="110"/>
-	<line class="st3" x1="10" y1="0.1" x2="10" y2="200.1"/>
-	<line class="st3" x1="190" y1="0.1" x2="190" y2="200.1"/>
-	<line class="st3" x1="0" y1="10" x2="200" y2="10"/>
-	<line class="st3" x1="0" y1="190" x2="200" y2="190"/>
-</g>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/yml.svg b/packages/theme-light-extension/style/icons/jupyter/yml.svg
deleted file mode 100644
index 6beb3faa22c0..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/yml.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#D81B60;}
-	.st1{display:none;}
-	.st2{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st0" d="M7.2,18.6v-5.4L3,5.6h3.3l1.4,3.1c0.3,0.9,0.6,1.6,1,2.5l0,0c0.3-0.8,0.6-1.6,1-2.5l1.4-3.1h3.4l-4.4,7.6v5.5
-		L7.2,18.6L7.2,18.6z"/>
-</g>
-<g class="st1">
-	<line class="st2" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st2" d="M21.5,11"/>
-	<path class="st2" d="M0.4,11"/>
-	<line class="st2" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st2" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st2" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st2" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st2" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st2" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st2" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st2" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st2" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st2" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st2" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st2" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st2" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st2" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st2" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st2" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st2" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st2" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st2" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st2" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st2" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st2" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st2" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st2" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st2" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st2" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st2" d="M22,22"/>
-	<path class="st2" d="M0,0"/>
-	<line class="st2" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st2" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st2" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st2" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st2" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st2" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.557 11.0014)" class="st2" width="6.2" height="6.2"/>
-	<line class="st2" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st2" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st2" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st2" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st2" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st2" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st2" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st2" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st2" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st2" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st2" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st2" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st2" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st2" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st2" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st2" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st2" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st2" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<circle class="st0" cx="17.6" cy="16.5" r="2.1"/>
-<circle class="st0" cx="17.6" cy="11" r="2.1"/>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/jupyter/yml_selected.svg b/packages/theme-light-extension/style/icons/jupyter/yml_selected.svg
deleted file mode 100644
index 97b6268a725e..000000000000
--- a/packages/theme-light-extension/style/icons/jupyter/yml_selected.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:none;stroke:#9E9E9E;stroke-width:2.000000e-02;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g class="st0">
-	<line class="st1" x1="11" y1="0" x2="11" y2="22"/>
-	<path class="st1" d="M21.5,11"/>
-	<path class="st1" d="M0.4,11"/>
-	<line class="st1" x1="0" y1="22" x2="22" y2="0"/>
-	<line class="st1" x1="11" y1="0" x2="22" y2="11"/>
-	<line class="st1" x1="0" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="11" y2="22"/>
-	<line class="st1" x1="11" y1="0" x2="0" y2="11"/>
-	<line class="st1" x1="14.3" y1="0" x2="14.3" y2="22"/>
-	<line class="st1" x1="7.7" y1="0" x2="7.7" y2="22"/>
-	<line class="st1" x1="3.3" y1="0" x2="3.3" y2="22"/>
-	<line class="st1" x1="18.7" y1="0" x2="18.7" y2="22"/>
-	<line class="st1" x1="22" y1="11" x2="0" y2="11"/>
-	<line class="st1" x1="22" y1="14.3" x2="0" y2="14.3"/>
-	<line class="st1" x1="22" y1="7.7" x2="0" y2="7.7"/>
-	<line class="st1" x1="22" y1="3.3" x2="0" y2="3.3"/>
-	<line class="st1" x1="22" y1="18.7" x2="0" y2="18.7"/>
-	<line class="st1" x1="2.2" y1="0" x2="2.2" y2="22"/>
-	<line class="st1" x1="19.8" y1="0" x2="19.8" y2="22"/>
-	<line class="st1" x1="0" y1="19.8" x2="22" y2="19.8"/>
-	<line class="st1" x1="0" y1="2.2" x2="22" y2="2.2"/>
-	<line class="st1" x1="17.6" y1="0" x2="17.6" y2="22"/>
-	<line class="st1" x1="11" y1="1.6" x2="20.3" y2="11"/>
-	<line class="st1" x1="1.6" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="20.3" y1="11" x2="11" y2="20.3"/>
-	<line class="st1" x1="11" y1="1.6" x2="1.6" y2="11"/>
-	<line class="st1" x1="0" y1="0" x2="22" y2="22"/>
-	<line class="st1" x1="6.6" y1="0" x2="6.6" y2="22"/>
-	<line class="st1" x1="15.4" y1="0" x2="15.4" y2="22"/>
-	<line class="st1" x1="0" y1="15.4" x2="22" y2="15.4"/>
-	<line class="st1" x1="0" y1="6.6" x2="22" y2="6.6"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<path class="st1" d="M22,22"/>
-	<path class="st1" d="M0,0"/>
-	<line class="st1" x1="20.9" y1="22" x2="0" y2="1.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="22" y2="20.9"/>
-	<line class="st1" x1="0" y1="20.9" x2="20.9" y2="0"/>
-	<line class="st1" x1="22" y1="1.1" x2="1.1" y2="22"/>
-	<line class="st1" x1="4.4" y1="0" x2="4.4" y2="22"/>
-	<line class="st1" x1="22" y1="17.6" x2="0" y2="17.6"/>
-	<line class="st1" x1="22" y1="4.4" x2="0" y2="4.4"/>
-	<rect x="7.9" y="7.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.5576 10.9998)" class="st1" width="6.2" height="6.2"/>
-	<line class="st1" x1="0" y1="16.5" x2="22" y2="16.5"/>
-	<line class="st1" x1="16.5" y1="22" x2="16.5" y2="0"/>
-	<line class="st1" x1="5.5" y1="22" x2="5.5" y2="0"/>
-	<line class="st1" x1="22" y1="5.5" x2="0" y2="5.5"/>
-	<line class="st1" x1="12.1" y1="0" x2="12.1" y2="22"/>
-	<line class="st1" x1="13.2" y1="0" x2="13.2" y2="22"/>
-	<line class="st1" x1="8.8" y1="22" x2="8.8" y2="0"/>
-	<line class="st1" x1="9.9" y1="22" x2="9.9" y2="0"/>
-	<line class="st1" x1="0" y1="7.7" x2="22" y2="7.7"/>
-	<line class="st1" x1="0" y1="14.3" x2="22" y2="14.3"/>
-	<line class="st1" x1="0" y1="9.9" x2="22" y2="9.9"/>
-	<line class="st1" x1="0" y1="8.8" x2="22" y2="8.8"/>
-	<line class="st1" x1="22" y1="13.2" x2="0" y2="13.2"/>
-	<line class="st1" x1="22" y1="12.1" x2="0" y2="12.1"/>
-	<line class="st1" x1="1.1" y1="0" x2="1.1" y2="22"/>
-	<line class="st1" x1="20.9" y1="0" x2="20.9" y2="22"/>
-	<line class="st1" x1="0" y1="1.1" x2="22" y2="1.1"/>
-	<line class="st1" x1="0" y1="20.9" x2="22" y2="20.9"/>
-</g>
-<g>
-	<path class="st2" d="M7.2,18.6v-5.4L3,5.6h3.3l1.4,3.1c0.3,0.9,0.6,1.6,1,2.5l0,0c0.3-0.8,0.6-1.6,1-2.5l1.4-3.1h3.4l-4.4,7.6v5.5
-		L7.2,18.6L7.2,18.6z"/>
-</g>
-<circle class="st2" cx="17.6" cy="16.5" r="2.1"/>
-<circle class="st2" cx="17.6" cy="11" r="2.1"/>
-</svg>
diff --git a/packages/theme-light-extension/style/icons/md/ic_build_24px.svg b/packages/theme-light-extension/style/icons/md/ic_build_24px.svg
deleted file mode 100755
index 1d1818dcb5d8..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_build_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#616161" width="24" height="24" viewBox="0 0 24 24"><path d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_extension_24px.svg b/packages/theme-light-extension/style/icons/md/ic_extension_24px.svg
deleted file mode 100644
index 284fabb7a18b..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_extension_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#616161" width="24" height="24" viewBox="0 0 24 24"><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2.7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg b/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg
deleted file mode 100644
index 4e2a6c5f9d69..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#616161" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg
deleted file mode 100644
index 03c2a41343fd..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#ffffff" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg b/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg
deleted file mode 100644
index 10d00b5963cf..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#616161" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 9H9v6h6V9zm-2 4h-2v-2h2v2zm8-2V9h-2V7c0-1.1-.9-2-2-2h-2V3h-2v2h-2V3H9v2H7c-1.1 0-2 .9-2 2v2H3v2h2v2H3v2h2v2c0 1.1.9 2 2 2h2v2h2v-2h2v2h2v-2h2c1.1 0 2-.9 2-2v-2h2v-2h-2v-2h2zm-4 6H7V7h10v10z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg
deleted file mode 100644
index c1830a8dd425..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#ffffff" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 9H9v6h6V9zm-2 4h-2v-2h2v2zm8-2V9h-2V7c0-1.1-.9-2-2-2h-2V3h-2v2h-2V3H9v2H7c-1.1 0-2 .9-2 2v2H3v2h2v2H3v2h2v2c0 1.1.9 2 2 2h2v2h2v-2h2v2h2v-2h2c1.1 0 2-.9 2-2v-2h2v-2h-2v-2h2zm-4 6H7V7h10v10z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_palette_24px.svg b/packages/theme-light-extension/style/icons/md/ic_palette_24px.svg
deleted file mode 100644
index 6a649720d077..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_palette_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#616161" width="24" height="24" viewBox="0 0 24 24"><path d="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5 0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83.67-1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5.67 1.5 1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5.67 1.5 1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/icons/md/ic_tab_24px.svg b/packages/theme-light-extension/style/icons/md/ic_tab_24px.svg
deleted file mode 100644
index e9bf36bfb6f6..000000000000
--- a/packages/theme-light-extension/style/icons/md/ic_tab_24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#616161" width="24" height="24" viewBox="0 0 24 24"><path d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h10v4h8v10z"/></svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/images/jupyter-favicon.svg b/packages/theme-light-extension/style/images/jupyter-favicon.svg
deleted file mode 100644
index 41d846fc9d5f..000000000000
--- a/packages/theme-light-extension/style/images/jupyter-favicon.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="152px" height="165px" viewBox="0 0 152 165" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" fill="#F37726">
-            <g id="logo.svg">
-                <g id="Canvas">
-                    <g id="logo">
-                        <g id="g">
-                            <g id="path" transform="translate(0.000000, 109.804878)">
-                                <g id="path8-fill">
-                                    <g id="path1_fill-link" transform="translate(0.078947, 0.778049)">
-                                        <path d="M75.9422842,29.5804561 C43.3023947,29.5804561 14.7967832,17.6534634 0,0 C5.51083211,15.8406829 15.7815389,29.5667732 29.3904947,39.2784171 C42.9997,48.9898537 59.2737,54.2067805 75.9605789,54.2067805 C92.6474579,54.2067805 108.921458,48.9898537 122.530663,39.2784171 C136.139453,29.5667732 146.410284,15.8406829 151.921158,0 C137.087868,17.6534634 108.582589,29.5804561 75.9422842,29.5804561 L75.9422842,29.5804561 Z" id="path1_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                            <g id="path">
-                                <g id="path9-fill">
-                                    <g id="path2_fill-link" transform="translate(0.037368, 0.704878)">
-                                        <path d="M75.9784579,24.6264073 C108.618763,24.6264073 137.124458,36.5534415 151.921158,54.2067805 C146.410284,38.366222 136.139453,24.6401317 122.530663,14.9284878 C108.921458,5.2168439 92.6474579,0 75.9605789,0 C59.2737,0 42.9997,5.2168439 29.3904947,14.9284878 C15.7815389,24.6401317 5.51083211,38.366222 0,54.2067805 C14.8330816,36.5899293 43.3385684,24.6264073 75.9784579,24.6264073 L75.9784579,24.6264073 Z" id="path2_fill"></path>
-                                    </g>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/packages/theme-light-extension/style/urls.css b/packages/theme-light-extension/style/urls.css
index cac64fde09c1..caf70dd34f84 100644
--- a/packages/theme-light-extension/style/urls.css
+++ b/packages/theme-light-extension/style/urls.css
@@ -8,10 +8,10 @@
 
   These images are included with JupyterLab for showing the Project Jupyter logo
   */
+
   --jp-image-jupyter: url('images/jupyter.svg');
   --jp-image-jupyterlab: url('images/jupyterlab.svg');
   --jp-image-jupyterlab-workmark: url('images/jupyterlab-wordmark.svg');
-  --jp-image-jupyter-favicon: url('images/jupyter-favicon.svg');
   --jp-image-caretleft: url('images/caretleft.png');
   --jp-image-caretright: url('images/caretright.png');
   --jp-image-caretup: url('images/caretup.png');
@@ -31,10 +31,7 @@
   --jp-about-header-logo: url('icons/jupyter/jupyter.svg');
   --jp-about-header-wordmark: url('images/jupyterlab-wordmark.svg');
   --jp-icon-add: url('icons/md/ic_add_24px.svg');
-  --jp-icon-notebook-selected: url('icons/jupyter/notebook_selected.svg');
-  --jp-icon-notebook: url('icons/jupyter/notebook.svg');
   --jp-icon-bug: url('icons/md/bug.svg');
-  --jp-icon-build: url('icons/md/ic_build_24px.svg');
   --jp-icon-caretdown: url('icons/md/caretdown.svg');
   --jp-icon-caretleft: url('icons/md/caretleft.svg');
   --jp-icon-caretright: url('icons/md/caretright.svg');
@@ -51,41 +48,23 @@
   --jp-icon-download: url('icons/md/download.svg');
   --jp-icon-edit: url('icons/md/edit.svg');
   --jp-icon-ellipses: url('icons/md/ellipses.svg');
-  --jp-icon-extension: url('icons/md/ic_extension_24px.svg');
   --jp-icon-file-upload: url('icons/md/ic_file_upload_24px.svg');
-  --jp-icon-file-selected: url('icons/jupyter/file_selected.svg');
-  --jp-icon-file: url('icons/jupyter/file.svg');
   --jp-icon-filter-list: url('icons/md/ic_filter_list_24px.svg');
-  --jp-icon-folder-selected: url('icons/md/ic_folder_24px_selected.svg');
-  --jp-icon-folder: url('icons/md/ic_folder_24px.svg');
   --jp-icon-home: url('icons/md/ic_home_24px.svg');
-  --jp-icon-image-selected: url('icons/jupyter/image_selected.svg');
-  --jp-icon-image: url('icons/jupyter/image.svg');
   --jp-icon-inspector: url('icons/md/baseline-web-24px.svg');
   --jp-icon-inverse-circle: url('icons/md/circle-inverse.svg');
   --jp-icon-inverse-close-circle: url('icons/md/close-circle-inverse.svg');
   --jp-icon-inverse-close: url('icons/md/close-inverse.svg');
-  --jp-icon-json-selected: url('icons/jupyter/json_selected.svg');
-  --jp-icon-json: url('icons/jupyter/json.svg');
   --jp-icon-jupyter: url('icons/jupyter/jupyter.svg');
   --jp-icon-kernel-running: url('icons/md/panorama_fish_eye.svg');
-  --jp-icon-kernel-selected: url('icons/md/ic_memory_24px_selected.svg');
-  --jp-icon-kernel: url('icons/md/ic_memory_24px.svg');
   --jp-icon-keyboard-selected: url('icons/md/ic_keyboard_24px_selected.svg');
   --jp-icon-keyboard: url('icons/md/ic_keyboard_24px.svg');
   --jp-icon-launcher-selected: url('icons/md/ic_launch_24px_selected.svg');
   --jp-icon-launcher: url('icons/md/ic_launch_24px.svg');
   --jp-icon-link: url('icons/md/link.svg');
-  --jp-icon-markdown-selected: url('icons/jupyter/markdown_selected.svg');
-  --jp-icon-markdown: url('icons/jupyter/markdown.svg');
   --jp-icon-more: url('icons/md/more-horiz.svg');
   --jp-icon-new-folder: url('icons/md/ic_create_new_folder_24px.svg');
-  --jp-icon-palette: url('icons/md/ic_palette_24px.svg');
   --jp-icon-paste: url('icons/md/paste.svg');
-  --jp-icon-python-selected: url('icons/jupyter/python_selected.svg');
-  --jp-icon-python: url('icons/jupyter/python.svg');
-  --jp-icon-r-selected: url('icons/jupyter/r_selected.svg');
-  --jp-icon-r: url('icons/jupyter/r.svg');
   --jp-icon-refresh: url('icons/md/ic_refresh_18px.svg');
   --jp-icon-run: url('icons/md/run.svg');
   --jp-icon-save: url('icons/md/save.svg');
@@ -97,16 +76,10 @@
   --jp-icon-search-regex: url('icons/jupyter/search_regex.svg');
   --jp-icon-settings-selected: url('icons/md/ic_settings_24px_selected.svg');
   --jp-icon-settings: url('icons/md/ic_settings_24px.svg');
-  --jp-icon-spreadsheet-selected: url('icons/jupyter/csv_selected.svg');
-  --jp-icon-spreadsheet: url('icons/jupyter/csv.svg');
   --jp-icon-stop: url('icons/md/stop.svg');
   --jp-icon-stop-circle: url('icons/md/stop-circle.svg');
-  --jp-icon-tab: url('icons/md/ic_tab_24px.svg');
-  --jp-icon-terminal: url('icons/jupyter/terminal.svg');
   --jp-icon-text-editor-selected: url('icons/md/ic_format_align_left_24px_selected.svg');
   --jp-icon-text-editor: url('icons/md/ic_format_align_left_24px.svg');
   --jp-icon-undo: url('icons/md/undo.svg');
   --jp-icon-vega: url('icons/jupyter/vega.svg');
-  --jp-icon-yaml-selected: url('icons/jupyter/yml_selected.svg');
-  --jp-icon-yaml: url('icons/jupyter/yml.svg');
 }
diff --git a/packages/theme-light-extension/style/variables.css b/packages/theme-light-extension/style/variables.css
index cb6fb3eefa8c..973bc959dc10 100644
--- a/packages/theme-light-extension/style/variables.css
+++ b/packages/theme-light-extension/style/variables.css
@@ -221,6 +221,7 @@ all of MD as it is not optimized for dense, information rich UIs.
   --jp-brand-color1: var(--md-blue-500);
   --jp-brand-color2: var(--md-blue-300);
   --jp-brand-color3: var(--md-blue-100);
+  --jp-brand-color4: var(--md-blue-50);
 
   --jp-accent-color0: var(--md-green-700);
   --jp-accent-color1: var(--md-green-500);
@@ -378,4 +379,10 @@ all of MD as it is not optimized for dense, information rich UIs.
     --jp-inverse-layout-color0
   );
   --jp-search-unselected-match-color: var(--jp-ui-inverse-font-color0);
+
+  /* Icon colors that work well with light or dark backgrounds */
+  --jp-icon-contrast-color0: var(--md-purple-600);
+  --jp-icon-contrast-color1: var(--md-green-600);
+  --jp-icon-contrast-color2: var(--md-pink-600);
+  --jp-icon-contrast-color3: var(--md-blue-600);
 }
diff --git a/packages/ui-components-extension/README.md b/packages/ui-components-extension/README.md
new file mode 100644
index 000000000000..fdde3e03b583
--- /dev/null
+++ b/packages/ui-components-extension/README.md
@@ -0,0 +1,3 @@
+# @jupyterlab/ui-components-extension
+
+A JupyterLab package that provides plugins that serve the UI elements produced by `@jupyterlab/ui-components`.
diff --git a/packages/ui-components-extension/package.json b/packages/ui-components-extension/package.json
new file mode 100644
index 000000000000..65a29b25ba6b
--- /dev/null
+++ b/packages/ui-components-extension/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "@jupyterlab/ui-components-extension",
+  "version": "1.1.0-alpha.1",
+  "description": "JupyterLab - UI component plugins",
+  "homepage": "https://github.com/jupyterlab/jupyterlab",
+  "bugs": {
+    "url": "https://github.com/jupyterlab/jupyterlab/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jupyterlab/jupyterlab.git"
+  },
+  "license": "BSD-3-Clause",
+  "author": "Project Jupyter",
+  "files": [
+    "lib/*.d.ts",
+    "lib/*.js",
+    "style/*"
+  ],
+  "sideEffects": [
+    "style/**/*"
+  ],
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "style": "style/index.css",
+  "directories": {
+    "lib": "lib/"
+  },
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rimraf lib",
+    "docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
+    "prepublishOnly": "npm run build",
+    "watch": "tsc -b --watch"
+  },
+  "dependencies": {
+    "@jupyterlab/application": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1"
+  },
+  "devDependencies": {
+    "rimraf": "~2.6.2",
+    "typedoc": "^0.14.2",
+    "typescript": "~3.5.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "jupyterlab": {
+    "extension": true
+  }
+}
diff --git a/packages/ui-components-extension/src/index.ts b/packages/ui-components-extension/src/index.ts
new file mode 100644
index 000000000000..d5adc3efe7ad
--- /dev/null
+++ b/packages/ui-components-extension/src/index.ts
@@ -0,0 +1,20 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import {
+  JupyterFrontEnd,
+  JupyterFrontEndPlugin
+} from '@jupyterlab/application';
+
+import { IIconRegistry, defaultIconRegistry } from '@jupyterlab/ui-components';
+
+const iconRegistry: JupyterFrontEndPlugin<IIconRegistry> = {
+  id: '@jupyterlab/ui-components-extension:default-icon-registry',
+  provides: IIconRegistry,
+  autoStart: true,
+  activate: (app: JupyterFrontEnd) => {
+    return defaultIconRegistry;
+  }
+};
+
+export default iconRegistry;
diff --git a/packages/ui-components-extension/style/index.css b/packages/ui-components-extension/style/index.css
new file mode 100644
index 000000000000..6300595458a5
--- /dev/null
+++ b/packages/ui-components-extension/style/index.css
@@ -0,0 +1,12 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
+@import url('~@jupyterlab/apputils/style/index.css');
+@import url('~@jupyterlab/rendermime/style/index.css');
+@import url('~@jupyterlab/docregistry/style/index.css');
+@import url('~@jupyterlab/application/style/index.css');
+@import url('~@jupyterlab/notebook/style/index.css');
+@import url('~@jupyterlab/vdom/style/index.css');
diff --git a/packages/ui-components-extension/tdoptions.json b/packages/ui-components-extension/tdoptions.json
new file mode 100644
index 000000000000..90ea4ff6cc3e
--- /dev/null
+++ b/packages/ui-components-extension/tdoptions.json
@@ -0,0 +1,20 @@
+{
+  "excludeNotExported": true,
+  "mode": "file",
+  "target": "es5",
+  "module": "es5",
+  "lib": [
+    "lib.es2015.d.ts",
+    "lib.es2015.collection.d.ts",
+    "lib.es2015.promise.d.ts",
+    "lib.dom.d.ts"
+  ],
+  "out": "../../docs/api/ui-components-extension",
+  "baseUrl": ".",
+  "paths": {
+    "@jupyterlab/*": ["../packages/*"]
+  },
+  "esModuleInterop": true,
+  "jsx": "react",
+  "types": []
+}
diff --git a/packages/ui-components-extension/tsconfig.json b/packages/ui-components-extension/tsconfig.json
new file mode 100644
index 000000000000..e390491760f2
--- /dev/null
+++ b/packages/ui-components-extension/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfigbase",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src"
+  },
+  "include": ["src/*"],
+  "references": [
+    {
+      "path": "../application"
+    },
+    {
+      "path": "../ui-components"
+    }
+  ]
+}
diff --git a/packages/ui-components/README.md b/packages/ui-components/README.md
index 5b37d0218a24..9769e909b04a 100644
--- a/packages/ui-components/README.md
+++ b/packages/ui-components/README.md
@@ -1,3 +1,45 @@
 # @jupyterlab/ui-components
 
-A JupyterLab package that provides React UI components to core JupyterLab packages and third-party extensions.
+A JupyterLab package that provides UI elements of various types (React components, DOM elements, etc) to core JupyterLab packages and third-party extensions.
+
+# Icon notes
+
+## Icon sourcing notes
+
+The following icons were originally taken from a set of material design icons:
+
+- `filetype/folder.svg`
+  - originally `ic_folder_24px.svg`
+- `sidebar/build.svg`
+  - originally `ic_build_24px.svg`
+- `sidebar/extension.svg`
+  - originally `ic_extension_24px.svg`
+- `sidebar/palette.svg`
+  - originally `ic_palette_24px.svg`
+- `sidebar/tab.svg`
+  - originally `ic_tab_24px.svg`
+- `statusbar/kernel.svg`
+  - originally `ic_memory_24px.svg`
+
+## Icon usage notes
+
+The icons are organized into various categories in `./style/icons`, based on where/how they are used in Jupyterlab core. Some icons fall into multiple categories, and are noted here:
+
+- `filetype/file.svg`
+  - filetype
+  - settingeditor
+- `filetype/folder.svg`
+  - breadcrumb
+  - filetype
+  - sidebar
+- `filetype/markdown.svg`
+  - filetype
+  - settingeditor
+- `filetype/notebook.svg`
+  - filetype
+  - launcher
+  - settingeditor
+- `statusbar/terminal.svg`
+  - launcher
+  - statusbar
+  - settingeditor
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
index 2390d7e16e44..ce9cbb7c1988 100644
--- a/packages/ui-components/package.json
+++ b/packages/ui-components/package.json
@@ -13,10 +13,8 @@
   "license": "BSD-3-Clause",
   "author": "Project Jupyter",
   "files": [
-    "lib/*.d.ts",
-    "lib/*.js.map",
-    "lib/*.js",
-    "style/*.css"
+    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+    "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
   ],
   "sideEffects": [
     "style/**/*"
@@ -36,12 +34,18 @@
   },
   "dependencies": {
     "@blueprintjs/core": "^3.9.0",
-    "@blueprintjs/icons": "^3.3.0",
     "@blueprintjs/select": "^3.3.0",
-    "react": "~16.8.4"
+    "@jupyterlab/coreutils": "^3.1.0-alpha.1",
+    "@phosphor/coreutils": "^1.3.1",
+    "@phosphor/messaging": "^1.2.3",
+    "@phosphor/virtualdom": "^1.1.3",
+    "@phosphor/widgets": "^1.8.0",
+    "react": "~16.8.4",
+    "typestyle": "^2.0.1"
   },
   "devDependencies": {
     "@types/react": "~16.8.18",
+    "@types/webpack-env": "^1.13.9",
     "rimraf": "~2.6.2",
     "typedoc": "^0.14.2",
     "typescript": "~3.5.1"
diff --git a/packages/ui-components/src/index.tsx b/packages/ui-components/src/blueprint.tsx
similarity index 78%
rename from packages/ui-components/src/index.tsx
rename to packages/ui-components/src/blueprint.tsx
index 2d7e17463773..1bb5285b5d00 100644
--- a/packages/ui-components/src/index.tsx
+++ b/packages/ui-components/src/blueprint.tsx
@@ -26,7 +26,7 @@ import {
   Select as BPSelect,
   ISelectProps
 } from '@blueprintjs/select/lib/cjs/components/select/select';
-import { combineClassNames } from './utils';
+import { combineClasses } from './utils';
 
 export { Intent } from '@blueprintjs/core/lib/cjs/common/intent';
 
@@ -44,7 +44,7 @@ type CommonProps<T> = React.DOMAttributes<T>;
 export const Button = (props: IButtonProps & CommonProps<any>) => (
   <BPButton
     {...props}
-    className={combineClassNames(
+    className={combineClasses(
       props.className,
       props.minimal && 'minimal',
       'jp-Button'
@@ -57,10 +57,10 @@ export const InputGroup = (props: IInputGroupProps & CommonProps<any>) => {
     return (
       <BPInputGroup
         {...props}
-        className={combineClassNames(props.className, 'jp-InputGroup')}
+        className={combineClasses(props.className, 'jp-InputGroup')}
         rightElement={
           <div className="jp-InputGroupAction">
-            <Icon className="jp-Icon" icon={props.rightIcon} />
+            <BPIcon className={'jp-Icon'} icon={props.rightIcon} />
           </div>
         }
       />
@@ -69,18 +69,11 @@ export const InputGroup = (props: IInputGroupProps & CommonProps<any>) => {
   return (
     <BPInputGroup
       {...props}
-      className={combineClassNames(props.className, 'jp-InputGroup')}
+      className={combineClasses(props.className, 'jp-InputGroup')}
     />
   );
 };
 
-export const Icon = (props: IIconProps) => (
-  <BPIcon
-    {...props}
-    className={combineClassNames(props.className, 'jp-Icon')}
-  />
-);
-
 export const Collapse = (props: ICollapseProps & CommonProps<any>) => (
   <BPCollapse {...props} />
 );
@@ -88,13 +81,13 @@ export const Collapse = (props: ICollapseProps & CommonProps<any>) => (
 export const HTMLSelect = (props: IHTMLSelectProps & CommonProps<any>) => (
   <BPHTMLSelect
     {...props}
-    className={combineClassNames(props.className, 'jp-HTMLSelect')}
+    className={combineClasses(props.className, 'jp-HTMLSelect')}
   />
 );
 
 export const Select = (props: ISelectProps<any> & CommonProps<any>) => (
   <BPSelect
     {...props}
-    className={combineClassNames(props.className, 'jp-Select')}
+    className={combineClasses(props.className, 'jp-Select')}
   />
 );
diff --git a/packages/ui-components/src/icon/iconimports.ts b/packages/ui-components/src/icon/iconimports.ts
new file mode 100644
index 000000000000..3a9151eae78a
--- /dev/null
+++ b/packages/ui-components/src/icon/iconimports.ts
@@ -0,0 +1,62 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+/* This file was auto-generated by ensureUiComponents() in @jupyterlab/buildutils */
+
+import { Icon } from './interfaces';
+
+// icon svg import statements
+import fileSvg from '../../style/icons/filetype/file.svg';
+import folderSvg from '../../style/icons/filetype/folder.svg';
+import html5Svg from '../../style/icons/filetype/html5.svg';
+import imageSvg from '../../style/icons/filetype/image.svg';
+import jsonSvg from '../../style/icons/filetype/json.svg';
+import markdownSvg from '../../style/icons/filetype/markdown.svg';
+import notebookSvg from '../../style/icons/filetype/notebook.svg';
+import pythonSvg from '../../style/icons/filetype/python.svg';
+import rKernelSvg from '../../style/icons/filetype/r-kernel.svg';
+import reactSvg from '../../style/icons/filetype/react.svg';
+import spreadsheetSvg from '../../style/icons/filetype/spreadsheet.svg';
+import yamlSvg from '../../style/icons/filetype/yaml.svg';
+import buildSvg from '../../style/icons/sidebar/build.svg';
+import extensionSvg from '../../style/icons/sidebar/extension.svg';
+import paletteSvg from '../../style/icons/sidebar/palette.svg';
+import runningSvg from '../../style/icons/sidebar/running.svg';
+import tabSvg from '../../style/icons/sidebar/tab.svg';
+import jupyterFaviconSvg from '../../style/icons/splash/jupyter-favicon.svg';
+import kernelSvg from '../../style/icons/statusbar/kernel.svg';
+import lineFormSvg from '../../style/icons/statusbar/line-form.svg';
+import notTrustedSvg from '../../style/icons/statusbar/not-trusted.svg';
+import terminalSvg from '../../style/icons/statusbar/terminal.svg';
+import trustedSvg from '../../style/icons/statusbar/trusted.svg';
+
+// defaultIcons definition
+export namespace IconImports {
+  export const defaultIcons: ReadonlyArray<Icon.IModel> = [
+    { name: 'file', svg: fileSvg },
+    { name: 'folder', svg: folderSvg },
+    { name: 'html5', svg: html5Svg },
+    { name: 'image', svg: imageSvg },
+    { name: 'json', svg: jsonSvg },
+    { name: 'markdown', svg: markdownSvg },
+    { name: 'notebook', svg: notebookSvg },
+    { name: 'python', svg: pythonSvg },
+    { name: 'r-kernel', svg: rKernelSvg },
+    { name: 'react', svg: reactSvg },
+    { name: 'spreadsheet', svg: spreadsheetSvg },
+    { name: 'yaml', svg: yamlSvg },
+    { name: 'build', svg: buildSvg },
+    { name: 'extension', svg: extensionSvg },
+    { name: 'palette', svg: paletteSvg },
+    { name: 'running', svg: runningSvg },
+    { name: 'tab', svg: tabSvg },
+    { name: 'jupyter-favicon', svg: jupyterFaviconSvg },
+    { name: 'kernel', svg: kernelSvg },
+    { name: 'line-form', svg: lineFormSvg },
+    { name: 'not-trusted', svg: notTrustedSvg },
+    { name: 'terminal', svg: terminalSvg },
+    { name: 'trusted', svg: trustedSvg }
+  ];
+}
diff --git a/packages/ui-components/src/icon/iconregistry.tsx b/packages/ui-components/src/icon/iconregistry.tsx
new file mode 100644
index 000000000000..d2a5d70b6bfe
--- /dev/null
+++ b/packages/ui-components/src/icon/iconregistry.tsx
@@ -0,0 +1,212 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import React from 'react';
+import { classes } from 'typestyle/lib';
+
+import { Text } from '@jupyterlab/coreutils';
+
+import { IIconRegistry, Icon } from './interfaces';
+import { IconImports } from './iconimports';
+import { iconStyle, iconStyleFlat } from '../style/icon';
+
+import badSvg from '../../style/debug/bad.svg';
+import blankSvg from '../../style/debug/blank.svg';
+
+/**
+ * The icon registry class.
+ */
+export class IconRegistry implements IIconRegistry {
+  constructor(options: IconRegistry.IOptions = {}) {
+    this._debug = !!options.debug;
+
+    let icons = options.initialIcons || IconImports.defaultIcons;
+    this.addIcon(...icons);
+
+    // add the bad state and blank icons
+    this.addIcon(
+      { name: 'bad', svg: badSvg },
+      { name: 'blank', svg: blankSvg }
+    );
+  }
+
+  addIcon(...icons: Icon.IModel[]): void {
+    icons.forEach((icon: Icon.IModel) => {
+      let className = icon.className
+        ? icon.className
+        : IconRegistry.iconClassName(icon.name);
+      this._classNameToName[className] = icon.name;
+      this._nameToClassName[icon.name] = className;
+      this._svg[icon.name] = icon.svg;
+    });
+  }
+
+  contains(name: string): boolean {
+    return name in this._svg || name in this._classNameToName;
+  }
+
+  /**
+   * Get the icon as an HTMLElement of tag <svg><svg/>
+   */
+  icon(
+    props: Icon.INodeOptions & { container?: HTMLElement }
+  ): HTMLElement | null {
+    const { name, className, title, container, ...propsStyle } = props;
+
+    // we may have been handed a className in place of name
+    let resolvedName = this.resolveName(name);
+    if (
+      !resolvedName ||
+      (container &&
+        container.dataset.icon &&
+        container.dataset.icon === resolvedName)
+    ) {
+      // bail if failing silently or icon node is already set
+      return;
+    }
+
+    let svgNode = Private.parseSvg(this.svg(resolvedName));
+
+    if (title) {
+      Private.setTitleSvg(svgNode, title);
+    }
+
+    if (container) {
+      // clear any existing icon in container (and all other child elements)
+      container.textContent = '';
+      container.dataset.icon = resolvedName;
+      container.appendChild(svgNode);
+
+      let styleClass = propsStyle ? iconStyle(propsStyle) : '';
+      if (className || className === '') {
+        // override the className, if explicitly passed
+        container.className = classes(className, styleClass);
+      } else if (!container.classList.contains(styleClass)) {
+        // add icon styling class to the container's class, if not already present
+        container.className = classes(container.className, styleClass);
+      }
+    } else {
+      // add icon styling class directly to the svg node
+      svgNode.setAttribute(
+        'class',
+        classes(className, propsStyle ? iconStyleFlat(propsStyle) : '')
+      );
+    }
+
+    return svgNode;
+  }
+
+  /**
+   * Get the icon as a ReactElement of tag <tag><svg><svg/><tag/>
+   * TODO: figure out how to remove the unnecessary outer <tag>
+   */
+  iconReact(
+    props: Icon.INodeOptions & { tag?: 'div' | 'span' }
+  ): React.ReactElement {
+    const { name, className, title, tag, ...propsStyle } = props;
+    const Tag = tag || 'div';
+
+    // we may have been handed a className in place of name
+    let resolvedName = this.resolveName(name);
+    if (!resolvedName) {
+      // bail if failing silently
+      return <></>;
+    }
+
+    return (
+      <Tag
+        className={classes(className, propsStyle ? iconStyle(propsStyle) : '')}
+        dangerouslySetInnerHTML={{
+          __html: resolvedName ? this.svg(resolvedName) : ''
+        }}
+      />
+    );
+  }
+
+  resolveName(name: string): string {
+    if (!(name in this._svg)) {
+      // assume name is really a className, split the className into parts and check each part
+      for (let className of name.split(/\s+/)) {
+        if (className in this._classNameToName) {
+          return this._classNameToName[className];
+        }
+      }
+      if (this._debug) {
+        // couldn't resolve name, mark as bad and warn
+        console.error(`Invalid icon name: ${name}`);
+        return 'bad';
+      } else {
+        // couldn't resolve name, fail silently
+        return '';
+      }
+    }
+
+    return name;
+  }
+
+  svg(name: string): string {
+    return this._svg[name];
+  }
+
+  static iconClassName(name: string): string {
+    return 'jp-' + Text.camelCase(name, true) + 'Icon';
+  }
+
+  private _classNameToName: { [key: string]: string } = Object.create(null);
+  private _debug: boolean = false;
+  private _nameToClassName: { [key: string]: string } = Object.create(null);
+  private _svg: { [key: string]: string } = Object.create(null);
+}
+
+/**
+ * The defaultIconRegistry instance.
+ */
+export const defaultIconRegistry: IconRegistry = new IconRegistry();
+
+/**
+ * Alias for defaultIconRegistry.iconReact that can be used as a React component
+ */
+export const DefaultIconReact = (
+  props: Icon.INodeOptions & { tag?: 'div' | 'span' }
+): React.ReactElement => {
+  return defaultIconRegistry.iconReact(props);
+};
+
+export namespace IconRegistry {
+  /**
+   * The options used to create an icon registry.
+   */
+  export interface IOptions {
+    /**
+     * The initial icons for the registry.
+     * The [[Icon.defaultIcons]] will be used if not given.
+     */
+    initialIcons?: Icon.IModel[];
+
+    /**
+     * If the debug flag is set, missing icons will raise a warning
+     * and be visually marked with an "X". Otherwise, missing icons
+     * will fail silently.
+     */
+    debug?: boolean;
+  }
+}
+
+namespace Private {
+  export function parseSvg(svg: string): HTMLElement {
+    let parser = new DOMParser();
+    return parser.parseFromString(svg, 'image/svg+xml').documentElement;
+  }
+
+  export function setTitleSvg(svgNode: HTMLElement, title: string): void {
+    // add a title node to the top level svg node
+    let titleNodes = svgNode.getElementsByTagName('title');
+    if (titleNodes) {
+      titleNodes[0].textContent = title;
+    } else {
+      let titleNode = document.createElement('title');
+      titleNode.textContent = title;
+      svgNode.appendChild(titleNode);
+    }
+  }
+}
diff --git a/packages/ui-components/src/icon/index.ts b/packages/ui-components/src/icon/index.ts
new file mode 100644
index 000000000000..c64a470388c7
--- /dev/null
+++ b/packages/ui-components/src/icon/index.ts
@@ -0,0 +1,7 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+export * from './iconimports';
+export * from './iconregistry';
+export * from './interfaces';
+export * from './tabbarsvg';
diff --git a/packages/ui-components/src/icon/interfaces.ts b/packages/ui-components/src/icon/interfaces.ts
new file mode 100644
index 000000000000..e1f6e7c6c74d
--- /dev/null
+++ b/packages/ui-components/src/icon/interfaces.ts
@@ -0,0 +1,63 @@
+import { Token } from '@phosphor/coreutils';
+
+import { IIconStyle } from '../style/icon';
+import React from 'react';
+
+/**
+ * The interface for an object that keeps a registry of inline
+ * svg icons. Has methods for setting up inline svg icons as
+ * either `HTMLElement` or `ReactElement`
+ */
+export interface IIconRegistry {
+  /**
+   * Add the raw text representation of an svg icon to this registry
+   */
+  addIcon(...icons: Icon.IModel[]): void;
+
+  /**
+   * Check if any icon of name `name` has been registered.
+   * Exact matches only
+   */
+  contains(name: string): boolean;
+
+  /**
+   * Get the icon as an HTMLElement of tag <svg><svg/>
+   */
+  icon(
+    props: Icon.INodeOptions & { container: HTMLElement }
+  ): HTMLElement | null;
+
+  /**
+   * Get the icon as a ReactElement of tag <tag><svg><svg/><tag/>
+   */
+  iconReact(
+    props: Icon.INodeOptions & { tag?: 'div' | 'span' }
+  ): React.ReactElement;
+}
+
+/**
+ * The IIconRegistry token.
+ */
+export const IIconRegistry = new Token<IIconRegistry>(
+  '@jupyterlab/ui-components:IIconRegistry'
+);
+
+export namespace Icon {
+  /**
+   * A representation of the resources underlying an inline svg icon
+   */
+  export interface IModel {
+    name: string;
+    className?: string;
+    svg: string;
+  }
+
+  /**
+   * The options used when creating an icon node
+   */
+  export interface INodeOptions extends IIconStyle {
+    name: string;
+    className?: string;
+    title?: string;
+  }
+}
diff --git a/packages/ui-components/src/icon/tabbarsvg.ts b/packages/ui-components/src/icon/tabbarsvg.ts
new file mode 100644
index 000000000000..f48845193340
--- /dev/null
+++ b/packages/ui-components/src/icon/tabbarsvg.ts
@@ -0,0 +1,140 @@
+import { Message } from '@phosphor/messaging';
+
+import { h, VirtualElement } from '@phosphor/virtualdom';
+
+import { DockPanel, TabBar, Widget } from '@phosphor/widgets';
+
+import { IconKindType } from '../style/icon';
+import { defaultIconRegistry } from './iconregistry';
+
+/**
+ * A widget which displays titles as a single row or column of tabs. Tweaked
+ * to enable the use of inline svgs as tab icons.
+ */
+export class TabBarSvg<T> extends TabBar<T> {
+  /**
+   * Construct a new tab bar. Sets the (icon) kind and overrides
+   * the default renderer.
+   *
+   * @param options - The options for initializing the tab bar.
+   */
+  constructor(options: TabBarSvg.IOptions<T>) {
+    options.renderer = options.renderer || TabBarSvg.defaultRenderer;
+    super(options);
+
+    this._kind = options.kind;
+  }
+
+  /**
+   * A message handler invoked on an `'update-request'` message. Adds svg
+   * nodes to icon nodes as appropriate
+   */
+  protected onUpdateRequest(msg: Message): void {
+    super.onUpdateRequest(msg);
+
+    for (let itab in this.contentNode.children) {
+      let tab = this.contentNode.children[itab];
+      let title = this.titles[itab];
+      let iconNode = tab.children ? (tab.children[0] as HTMLElement) : null;
+
+      if (iconNode) {
+        // add the svg node, if not already present
+        defaultIconRegistry.icon({
+          name: title.iconClass,
+          className: '',
+          container: iconNode,
+          center: true,
+          kind: this._kind
+        });
+      }
+    }
+  }
+
+  protected _kind: IconKindType;
+}
+
+export namespace TabBarSvg {
+  export interface IOptions<T> extends TabBar.IOptions<T> {
+    /**
+     * The kind of icon this tab bar widget should render.
+     * Adds preset styling to the icons.
+     */
+    kind?: IconKindType;
+  }
+
+  /**
+   * A modified implementation of the TabBar Renderer.
+   */
+  export class Renderer extends TabBar.Renderer {
+    /**
+     * Render the icon element for a tab. This version avoids clobbering
+     * the icon node's children.
+     *
+     * @param data - The data to use for rendering the tab.
+     *
+     * @returns A virtual element representing the tab icon.
+     */
+    renderIcon(data: TabBar.IRenderData<any>): VirtualElement {
+      let className = this.createIconClass(data);
+      return h.div({ className });
+    }
+  }
+
+  export const defaultRenderer = new Renderer();
+}
+
+/**
+ * A widget which provides a flexible docking area for widgets.Tweaked
+ * to enable the use of inline svgs as tab icons.
+ */
+export class DockPanelSvg extends DockPanel {
+  /**
+   * Construct a new dock panel. Overrides the default renderer
+   * and sets the (icon) kind
+   *
+   * @param options - The options for initializing the panel.
+   */
+  constructor(options: DockPanelSvg.IOptions) {
+    if (!options.renderer) {
+      options.renderer = new DockPanelSvg.Renderer(options.kind);
+    }
+
+    super(options);
+  }
+}
+
+export namespace DockPanelSvg {
+  export interface IOptions extends DockPanel.IOptions {
+    /**
+     * The kind of icon this dock panel widget should render.
+     * Adds preset styling to the icons.
+     */
+    kind?: IconKindType;
+  }
+
+  /**
+   * A modified implementation of the DockPanel Renderer.
+   */
+  export class Renderer extends DockPanel.Renderer {
+    constructor(kind?: IconKindType) {
+      super();
+      this._kind = kind;
+    }
+
+    /**
+     * Create a new tab bar (with inline svg icons enabled
+     * for use with a dock panel.
+     *
+     * @returns A new tab bar for a dock panel.
+     */
+    createTabBar(): TabBarSvg<Widget> {
+      let bar = new TabBarSvg<Widget>({
+        kind: this._kind
+      });
+      bar.addClass('p-DockPanel-tabBar');
+      return bar;
+    }
+
+    _kind: IconKindType;
+  }
+}
diff --git a/packages/ui-components/src/index.ts b/packages/ui-components/src/index.ts
new file mode 100644
index 000000000000..cabb6173cab6
--- /dev/null
+++ b/packages/ui-components/src/index.ts
@@ -0,0 +1,6 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+export * from './blueprint';
+export * from './icon';
+export * from './utils';
diff --git a/packages/ui-components/src/style/icon.ts b/packages/ui-components/src/style/icon.ts
new file mode 100644
index 000000000000..b4f9910eec7f
--- /dev/null
+++ b/packages/ui-components/src/style/icon.ts
@@ -0,0 +1,260 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import { cssRule, style } from 'typestyle/lib';
+import { NestedCSSProperties } from 'typestyle/lib/types';
+
+/**
+ * - breadCrumb: The path icons above the filebrowser
+ * - dockPanelBar: The tab icons above the main area
+ * - launcherCard: The icons for the cards at the bottom of the launcher
+ * - launcherSection: The icons to left of the Launcher section headers
+ * - listing: The icons to the left of the filebrowser listing items
+ * - settingsEditor: The icons to the left of each section of the settings editor
+ * - sideBar: The icons for the sidebar (default to the left of the main window)
+ * - splash: The icon used for the splash screen
+ * - tabManager: The icons for the tabManager in the sidebar
+ */
+export type IconKindType =
+  | 'breadCrumb'
+  | 'dockPanelBar'
+  | 'launcherCard'
+  | 'launcherSection'
+  | 'listing'
+  | 'settingsEditor'
+  | 'sideBar'
+  | 'splash'
+  | 'statusBar'
+  | 'tabManager'
+  | 'unset';
+
+export interface IIconStyle extends NestedCSSProperties {
+  /**
+   * center the icon svg in its container
+   */
+  center?: boolean;
+
+  /**
+   * the kind of the icon, associated with a default stylesheet
+   */
+  kind?: IconKindType;
+}
+
+/**
+ * styles for centering node inside of containers
+ */
+const containerCSSCenter: NestedCSSProperties = {
+  alignItems: 'center',
+  display: 'flex'
+};
+
+const iconCSSCenter: NestedCSSProperties = {
+  display: 'block',
+  margin: '0 auto',
+  width: '100%'
+};
+
+/**
+ * icon kind specific styles
+ */
+const iconCSSBreadCrumb: NestedCSSProperties = {
+  borderRadius: 'var(--jp-border-radius)',
+  cursor: 'pointer',
+  margin: '0px 2px',
+  padding: '0px 2px',
+  height: '16px',
+  width: '16px',
+  verticalAlign: 'middle',
+  $nest: {
+    '&:hover': {
+      backgroundColor: 'var(--jp-layout-color2)'
+    },
+    '&:first-child': {
+      marginLeft: '0px'
+    },
+    ['.jp-mod-dropTarget']: {
+      backgroundColor: 'var(--jp-brand-color2)',
+      opacity: 0.7
+    }
+  }
+};
+
+const iconCSSDockPanelBar: NestedCSSProperties = {
+  height: '14px',
+  width: '14px'
+};
+
+const iconCSSLauncherCard: NestedCSSProperties = {
+  height: 'var(--jp-private-launcher-large-icon-size)',
+  width: 'var(--jp-private-launcher-large-icon-size)'
+};
+
+const iconCSSLauncherSection: NestedCSSProperties = {
+  marginRight: '12px',
+  height: 'var(--jp-private-launcher-small-icon-size)',
+  width: 'var(--jp-private-launcher-small-icon-size)'
+};
+
+const iconCSSListing: NestedCSSProperties = {
+  height: '16px',
+  width: '16px'
+};
+
+const iconCSSSettingsEditor: NestedCSSProperties = {
+  height: '16px',
+  width: '16px'
+};
+
+const iconCSSSideBar: NestedCSSProperties = {
+  width: '20px'
+};
+
+const iconCSSSplash: NestedCSSProperties = {
+  width: '100px'
+};
+
+const iconCSSStatusBar: NestedCSSProperties = {
+  left: '0px',
+  top: '0px',
+  height: '18px',
+  width: '20px',
+  position: 'relative'
+};
+
+const iconCSSTabManager: NestedCSSProperties = {
+  height: '16px',
+  width: '16px'
+};
+
+const iconCSSKind: { [k in IconKindType]: NestedCSSProperties } = {
+  breadCrumb: iconCSSBreadCrumb,
+  dockPanelBar: iconCSSDockPanelBar,
+  launcherCard: iconCSSLauncherCard,
+  launcherSection: iconCSSLauncherSection,
+  listing: iconCSSListing,
+  settingsEditor: iconCSSSettingsEditor,
+  sideBar: iconCSSSideBar,
+  splash: iconCSSSplash,
+  statusBar: iconCSSStatusBar,
+  tabManager: iconCSSTabManager,
+  unset: {}
+};
+
+/**
+ * container kind specific styles
+ */
+const containerCSSDockPanelBar: NestedCSSProperties = {
+  marginRight: '4px'
+};
+
+const containerCSSLauncherCard: NestedCSSProperties = {
+  height: 'var(--jp-private-launcher-card-icon-height)'
+};
+
+const containerCSSListing: NestedCSSProperties = {
+  flex: '0 0 20px',
+  marginRight: '4px',
+  position: 'relative'
+};
+
+const containerCSSSettingsEditor: NestedCSSProperties = {
+  display: 'inline-block',
+  flex: '0 0 20px',
+  marginLeft: '2px',
+  marginRight: '1px',
+  position: 'relative',
+  height: '20px',
+  width: '20px'
+};
+
+const containerCSSSideBar: NestedCSSProperties = {
+  transform: 'rotate(90deg)'
+};
+
+const containerCSSSplash: NestedCSSProperties = {
+  animation: '0.3s fade-in linear forwards',
+  height: '100%',
+  width: '100%',
+  zIndex: 1
+};
+
+const containerCSSTabManager: NestedCSSProperties = {
+  marginRight: '2px',
+  position: 'relative'
+};
+
+const containerCSSKind: { [k in IconKindType]: NestedCSSProperties } = {
+  breadCrumb: {},
+  dockPanelBar: containerCSSDockPanelBar,
+  launcherCard: containerCSSLauncherCard,
+  launcherSection: {},
+  listing: containerCSSListing,
+  settingsEditor: containerCSSSettingsEditor,
+  sideBar: containerCSSSideBar,
+  splash: containerCSSSplash,
+  statusBar: {},
+  tabManager: containerCSSTabManager,
+  unset: {}
+};
+
+/**
+ * for putting together the icon kind style with any user input styling,
+ * as well as styling from optional flags like `center`
+ */
+function iconCSS(props: IIconStyle): NestedCSSProperties {
+  const { kind, center, ...propsCSS } = props;
+
+  return {
+    ...(center ? iconCSSCenter : {}),
+    ...(kind ? iconCSSKind[kind] : {}),
+    ...propsCSS
+  };
+}
+
+/**
+ * for putting together the container kind style with any
+ * styling from optional flags like `center`
+ */
+function containerCSS(props: IIconStyle): NestedCSSProperties {
+  const { kind, center } = props;
+
+  return {
+    ...(center ? containerCSSCenter : {}),
+    ...(kind ? containerCSSKind[kind] : {})
+  };
+}
+
+/**
+ * for setting the style on the container of an svg node representing an icon
+ */
+export const iconStyle = (props: IIconStyle): string => {
+  return style({
+    ...containerCSS(props),
+    $nest: {
+      ['svg']: iconCSS(props)
+    }
+  });
+};
+
+/**
+ * for setting the style directly on the svg node representing an icon
+ */
+export const iconStyleFlat = (props: IIconStyle): string => {
+  return style(iconCSS(props));
+};
+
+// TODO: Figure out a better cludge for styling current sidebar tab selection
+cssRule(
+  `.p-TabBar-tab.p-mod-current .${iconStyle({
+    center: true,
+    kind: 'sideBar'
+  })}`,
+  {
+    transform:
+      'rotate(90deg)\n' +
+      '    translate(\n' +
+      '      calc(-0.5 * var(--jp-border-width)),\n' +
+      '      calc(-0.5 * var(--jp-border-width))\n' +
+      '    )'
+  }
+);
diff --git a/packages/ui-components/src/svg.d.ts b/packages/ui-components/src/svg.d.ts
new file mode 100644
index 000000000000..90e4deda5555
--- /dev/null
+++ b/packages/ui-components/src/svg.d.ts
@@ -0,0 +1,58 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+// including this file in a package allows for the use of import statements
+// with svg files. Example: `import xSvg from 'path/xSvg.svg'`
+
+// for use with raw-loader in Webpack.
+// The svg will be imported as a raw string
+
+declare module '*.svg' {
+  const value: string;
+  export default value;
+}
+
+// for use with svg-react-loader in Webpack.
+// The svg will be imported as a ReactElement
+
+// declare module '*.svg' {
+//   import { HTMLAttributes } from 'react';
+//   const value: React.ComponentType<HTMLAttributes<SVGElement>>;
+//   export default value;
+// }
+
+// as an alternative to importing svgs one at a time, you can do a glob import
+// using `context.requires`. This is a Webpack only extension. Implementation:
+
+// import { PathExt } from '@jupyterlab/coreutils';
+//
+// /**
+//  * Import all svgs from a directory. The input argument should be
+//  * of the form `require.context('raw-loader!<path>', true, /\.svg$/)`.
+//  * <path> should be a string literal path, as this is needed by `require`.
+//  */
+// export function importSvgs(r: any, exclude: string[] = []): IModel[] {
+//   const excset = new Set(exclude);
+//
+//   return r.keys().reduce((svgs: IModel[], item: string, index: number) => {
+//     const name = PathExt.stem(item);
+//     if (!excset.has(name)) {
+//       svgs.push({ name: name, svg: r(item).default });
+//     }
+//     return svgs;
+//   }, []);
+// }
+//
+// // create the array of default icon models
+// let icons: IModel[];
+// try {
+//   // require.context is supplied by Webpack, and doesn't play nice with jest
+//   icons = importSvgs(
+//     require.context('raw-loader!../../style/icons', true, /\.svg$/),
+//     ['bad', 'blank']
+//   );
+// } catch (e) {
+//   // fallback for jest tests
+//   icons = [];
+// }
+// export const defaultIcons: ReadonlyArray<IModel> = icons;
diff --git a/packages/ui-components/src/utils.ts b/packages/ui-components/src/utils.ts
index 69ba135d38a8..ba5a549a732b 100644
--- a/packages/ui-components/src/utils.ts
+++ b/packages/ui-components/src/utils.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-export function combineClassNames(...classNames: (string | undefined)[]) {
-  return classNames.join(' ');
+export function combineClasses(...classNames: (string | undefined)[]) {
+  return classNames.filter(c => !!c).join(' ');
 }
diff --git a/packages/ui-components/style/base.css b/packages/ui-components/style/base.css
index 8adb7976093f..d8730de3cf3f 100644
--- a/packages/ui-components/style/base.css
+++ b/packages/ui-components/style/base.css
@@ -112,3 +112,7 @@ input::placeholder {
 select {
   box-sizing: border-box;
 }
+
+/* Sibling imports */
+@import './deprecated.css';
+@import './deprecatedExtra.css';
diff --git a/packages/ui-components/style/debug/bad.svg b/packages/ui-components/style/debug/bad.svg
new file mode 100644
index 000000000000..1fe7dcd245ef
--- /dev/null
+++ b/packages/ui-components/style/debug/bad.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        class="jp-icon0"
+        fill="#000"
+        d="M24 20.188l-8.315-8.209 8.2-8.282-3.697-3.697-8.212 8.318-8.31-8.203-3.666 3.666 8.321 8.24-8.206 8.313 3.666 3.666 8.237-8.318 8.285 8.203z"
+    />
+</svg>
diff --git a/packages/ui-components/style/debug/blank.svg b/packages/ui-components/style/debug/blank.svg
new file mode 100644
index 000000000000..d44952fd4948
--- /dev/null
+++ b/packages/ui-components/style/debug/blank.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        fill="#000"
+        fill-opacity="0.0"
+        d="M24 20.188l-8.315-8.209 8.2-8.282-3.697-3.697-8.212 8.318-8.31-8.203-3.666 3.666 8.321 8.24-8.206 8.313 3.666 3.666 8.237-8.318 8.285 8.203z"
+    />
+</svg>
diff --git a/packages/ui-components/style/deprecated.css b/packages/ui-components/style/deprecated.css
new file mode 100644
index 000000000000..70ec78758d03
--- /dev/null
+++ b/packages/ui-components/style/deprecated.css
@@ -0,0 +1,110 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+/* This file was auto-generated by ensureUiComponents() in @jupyterlab/buildutils */
+
+/**
+ * (DEPRECATED) Support for consuming icons as CSS background images
+ */
+
+/* Icons urls */
+
+:root {
+  --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-json: url('icons/filetype/json.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-spreadsheet: url('icons/filetype/spreadsheet.svg');
+  --jp-icon-yaml: url('icons/filetype/yaml.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-jupyter-favicon: url('icons/splash/jupyter-favicon.svg');
+  --jp-icon-kernel: url('icons/statusbar/kernel.svg');
+  --jp-icon-line-form: url('icons/statusbar/line-form.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');
+}
+
+/* Icon CSS class declarations */
+
+.jp-FileIcon {
+  background-image: var(--jp-icon-file);
+}
+.jp-FolderIcon {
+  background-image: var(--jp-icon-folder);
+}
+.jp-Html5Icon {
+  background-image: var(--jp-icon-html5);
+}
+.jp-ImageIcon {
+  background-image: var(--jp-icon-image);
+}
+.jp-JsonIcon {
+  background-image: var(--jp-icon-json);
+}
+.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-SpreadsheetIcon {
+  background-image: var(--jp-icon-spreadsheet);
+}
+.jp-YamlIcon {
+  background-image: var(--jp-icon-yaml);
+}
+.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-JupyterFaviconIcon {
+  background-image: var(--jp-icon-jupyter-favicon);
+}
+.jp-KernelIcon {
+  background-image: var(--jp-icon-kernel);
+}
+.jp-LineFormIcon {
+  background-image: var(--jp-icon-line-form);
+}
+.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);
+}
diff --git a/packages/theme-dark-extension/style/icons/jupyter/csv_selected.svg b/packages/ui-components/style/deprecated/selected/csv_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/csv_selected.svg
rename to packages/ui-components/style/deprecated/selected/csv_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/file_selected.svg b/packages/ui-components/style/deprecated/selected/file_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/file_selected.svg
rename to packages/ui-components/style/deprecated/selected/file_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/md/ic_folder_24px_selected.svg b/packages/ui-components/style/deprecated/selected/ic_folder_24px_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/md/ic_folder_24px_selected.svg
rename to packages/ui-components/style/deprecated/selected/ic_folder_24px_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/md/ic_memory_24px_selected.svg b/packages/ui-components/style/deprecated/selected/ic_memory_24px_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/md/ic_memory_24px_selected.svg
rename to packages/ui-components/style/deprecated/selected/ic_memory_24px_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/image_selected.svg b/packages/ui-components/style/deprecated/selected/image_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/image_selected.svg
rename to packages/ui-components/style/deprecated/selected/image_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/json_selected.svg b/packages/ui-components/style/deprecated/selected/json_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/json_selected.svg
rename to packages/ui-components/style/deprecated/selected/json_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/markdown_selected.svg b/packages/ui-components/style/deprecated/selected/markdown_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/markdown_selected.svg
rename to packages/ui-components/style/deprecated/selected/markdown_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/notebook_selected.svg b/packages/ui-components/style/deprecated/selected/notebook_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/notebook_selected.svg
rename to packages/ui-components/style/deprecated/selected/notebook_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/python_selected.svg b/packages/ui-components/style/deprecated/selected/python_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/python_selected.svg
rename to packages/ui-components/style/deprecated/selected/python_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/r_selected.svg b/packages/ui-components/style/deprecated/selected/r_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/r_selected.svg
rename to packages/ui-components/style/deprecated/selected/r_selected.svg
diff --git a/packages/theme-dark-extension/style/icons/jupyter/yml_selected.svg b/packages/ui-components/style/deprecated/selected/yml_selected.svg
similarity index 100%
rename from packages/theme-dark-extension/style/icons/jupyter/yml_selected.svg
rename to packages/ui-components/style/deprecated/selected/yml_selected.svg
diff --git a/packages/ui-components/style/deprecatedExtra.css b/packages/ui-components/style/deprecatedExtra.css
new file mode 100644
index 000000000000..25bd79e43ebb
--- /dev/null
+++ b/packages/ui-components/style/deprecatedExtra.css
@@ -0,0 +1,25 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+/**
+ * This file contains support for deprecated CSS not covered in the
+ * auto-generated `deprecated.css`.
+ */
+
+/* vars for consuming "selected" icons as CSS background images */
+
+:root {
+  --jp-icon-file-selected: url('deprecated/selected/file_selected.svg');
+  --jp-icon-folder-selected: url('deprecated/selected/ic_folder_24px_selected.svg');
+  --jp-icon-image-selected: url('deprecated/selected/image_selected.svg');
+  --jp-icon-json-selected: url('deprecated/selected/json_selected.svg');
+  --jp-icon-kernel-selected: url('deprecated/selected/ic_memory_24px_selected.svg');
+  --jp-icon-markdown-selected: url('deprecated/selected/markdown_selected.svg');
+  --jp-icon-notebook-selected: url('deprecated/selected/notebook_selected.svg');
+  --jp-icon-python-selected: url('deprecated/selected/python_selected.svg');
+  --jp-icon-r-selected: url('deprecated/selected/r_selected.svg');
+  --jp-icon-spreadsheet-selected: url('deprecated/selected/csv_selected.svg');
+  --jp-icon-yaml-selected: url('deprecated/selected/yml_selected.svg');
+}
diff --git a/packages/ui-components/style/icons/filetype/file.svg b/packages/ui-components/style/icons/filetype/file.svg
new file mode 100644
index 000000000000..0526ea36ef24
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/file.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<path class="jp-icon3 jp-icon-selectable" fill="#616161" d="M19.3,8.2l-5.5-5.5c-0.3-0.3-0.7-0.5-1.2-0.5H3.9C3.1,2.3,2.3,3.1,2.3,4v14.1c0,0.9,0.7,1.6,1.6,1.6h14.2
+	c0.9,0,1.6-0.7,1.6-1.6V9.4C19.8,8.9,19.6,8.5,19.3,8.2z M13.5,4.9l3.4,3.6h-3.4V4.9z M17.4,17.6l-12.7,0c-0.1,0-0.2,0-0.2-0.2V4.7
+	c0-0.2,0.1-0.3,0.2-0.3h7.2v4.4c0,0,0,0.8,0.3,1.1c0.3,0.3,1.1,0.3,1.1,0.3h4.3l0,7.2C17.6,17.4,17.5,17.6,17.4,17.6z"/>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/folder.svg b/packages/ui-components/style/icons/filetype/folder.svg
new file mode 100644
index 000000000000..e4d6d832d610
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/folder.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path class="jp-icon3 jp-icon-selectable" fill="#616161" d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/html5.svg b/packages/ui-components/style/icons/filetype/html5.svg
new file mode 100644
index 000000000000..d4c7978c5d4c
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/html5.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+	<g>
+		<path class="jp-icon0 jp-icon-selectable" fill="#000" d="M108.4 0h23v22.8h21.2V0h23v69h-23V46h-21v23h-23.2M206 23h-20.3V0h63.7v23H229v46h-23M259.5 0h24.1l14.8 24.3L313.2 0h24.1v69h-23V34.8l-16.1 24.8l-16.1-24.8v34.2h-22.6M348.7 0h23v46.2h32.6V69h-55.6"/>
+		<path class="jp-icon-selectable" fill="#e44d26" d="M107.6 471l-33-370.4h362.8l-33 370.2L255.7 512"/>
+		<path class="jp-icon-selectable" fill="#f16529" d="M256 480.5V131H404.3L376 447"/>
+	</g>
+	<g>
+		<path class="jp-icon-selectable-inverse" fill="#ebebeb" d="M142 176.3h114v45.4h-64.2l4.2 46.5h60v45.3H154.4M156.4 336.3H202l3.2 36.3 50.8 13.6v47.4l-93.2-26"/>
+		<path class="jp-icon-selectable-inverse" fill="#fff" d="M369.6 176.3H255.8v45.4h109.6M361.3 268.2H255.8v45.4h56l-5.3 59-50.7 13.6v47.2l93-25.8"/>
+	</g>>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/image.svg b/packages/ui-components/style/icons/filetype/image.svg
new file mode 100644
index 000000000000..7035ee0c4747
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/image.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<rect class="jp-icon-brand4 jp-icon-selectable-inverse" fill="#FFFFFF" x="2.2" y="2.2" width="17.5" height="17.5"/>
+	<path class="jp-icon-brand0 jp-icon-selectable" fill="#3F51B5" d="M2.2,2.2v17.5h17.5l0.1-17.5C19.8,2.2,2.2,2.2,2.2,2.2z M14.3,4.4c1.2,0,2.2,1,2.2,2.2s-1,2.2-2.2,2.2
+		s-2.2-1-2.2-2.2S13.1,4.4,14.3,4.4z M4.4,17.6l3.3-8.8l3.3,6.6l2.2-3.2l4.4,5.4H4.4z"/>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/json.svg b/packages/ui-components/style/icons/filetype/json.svg
new file mode 100644
index 000000000000..b840e84d4718
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/json.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<g class="jp-icon-warn1 jp-icon-selectable" fill="#F9A825">
+		<path d="M20.2,11.8c-1.6,0-1.7,0.5-1.7,1c0,0.4,0.1,0.9,0.1,1.3c0.1,0.5,0.1,0.9,0.1,1.3c0,1.7-1.4,2.3-3.5,2.3h-0.9
+			v-1.9h0.5c1.1,0,1.4,0,1.4-0.8c0-0.3,0-0.6-0.1-1c0-0.4-0.1-0.8-0.1-1.2c0-1.3,0-1.8,1.3-2l0,0c-1.3-0.2-1.3-0.7-1.3-2
+			c0-0.4,0.1-0.8,0.1-1.2c0.1-0.4,0.1-0.7,0.1-1c0-0.8-0.4-0.7-1.4-0.8h-0.5V4.1h0.9c2.2,0,3.5,0.7,3.5,2.3c0,0.4-0.1,0.9-0.1,1.3
+			c-0.1,0.5-0.1,0.9-0.1,1.3c0,0.5,0.2,1,1.7,1C20.2,10,20.2,11.8,20.2,11.8z"/>
+		<path d="M1.8,10.1c1.6,0,1.7-0.5,1.7-1c0-0.4-0.1-0.9-0.1-1.3C3.3,7.3,3.3,6.9,3.3,6.5c0-1.6,1.4-2.3,3.5-2.3h0.9
+			v1.9H7.2c-1,0-1.4,0-1.4,0.8c0,0.3,0,0.6,0.1,1c0,0.2,0.1,0.6,0.1,1c0,1.3,0,1.8-1.3,2l0,0C6,11.2,6,11.7,6,13
+			c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.3-0.1,0.7-0.1,1C5.8,16,6.1,16,7.2,16h0.5v1.9H6.8c-2.1,0-3.5-0.6-3.5-2.3c0-0.4,0.1-0.9,0.1-1.3
+			c0.1-0.5,0.1-0.9,0.1-1.3c0-0.5-0.2-1-1.7-1V10.1z"/>
+		<circle cx="11" cy="13.8" r="2.1"/>
+		<circle cx="11" cy="8.2" r="2.1"/>
+	</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/markdown.svg b/packages/ui-components/style/icons/filetype/markdown.svg
new file mode 100644
index 000000000000..691d2037ef02
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/markdown.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<g class="jp-icon-contrast0 jp-icon-selectable" fill="#7B1FA2">
+		<polygon points="5,14.9 17,14.9 10.9,20.9 "/>
+		<path d="M14.4,8.1c0-1.3-0.1-2.9-0.1-4.5l0,0C13.9,5,13.4,6.5,13,7.9l-1.3,4.3h-2L8.5,7.9C8.1,6.6,7.8,5,7.5,3.6l0,0
+			C7.4,5.2,7.4,6.8,7.3,8.2L7,12.4H4.8l0.7-11h3.3L10,5c0.4,1.2,0.7,2.7,1,3.9l0,0c0.3-1.2,0.7-2.6,1-3.9l1.2-3.7h3.3l0.6,11h-2.4
+			L14.4,8.1z"/>
+	</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/notebook.svg b/packages/ui-components/style/icons/filetype/notebook.svg
new file mode 100644
index 000000000000..cbf8bba2f6d2
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/notebook.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<g class="jp-icon-warn0 jp-icon-selectable" fill="#EF6C00">
+		<path class="st1" d="M18.7,3.3v15.4H3.3V3.3H18.7 M20.2,1.8H1.8v18.3h18.3l0,0L20.2,1.8L20.2,1.8z"/>
+		<polygon class="st1" points="16.5,16.5 11.1,12.2 5.5,16.5 5.5,5.5 16.5,5.5 	"/>
+	</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/python.svg b/packages/ui-components/style/icons/filetype/python.svg
new file mode 100644
index 000000000000..57e750cc0281
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/python.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+<g class="jp-icon-brand0 jp-icon-selectable" fill="#0D47A1">
+	<path d="M11.1,6.9c0-0.2,0-1.1,0-1.1c-1.4,0-3.5,0-4.2,0c0-0.5,0-1.3,0.2-1.6c0.4-0.7,0.8-1.1,1.7-1.4
+		c1.7-0.3,2.5-0.3,3.9-0.1c1,0.1,1.9,0.9,1.9,1.9c0,1.1,0,3,0,4.2c0,0.5-0.9,1.6-2,1.6s-2.5,0-3.8,0c-1.5,0-2.4,1.4-2.4,2.8
+		c0,0.4,0,2.2,0,2.2c-0.5,0-1.2,0-1.7,0C3.5,15.1,3,14,3,13.1c0-1.3,0-2.7,0-4.1C2.9,8,3.6,7,4.8,7C6.3,6.9,11.1,6.9,11.1,6.9z"/>
+	<path d="M10.9,15.1c0,0.2,0,1.1,0,1.1c1.4,0,3.5,0,4.2,0c0,0.5,0,1.3-0.2,1.6c-0.4,0.7-0.8,1.1-1.7,1.4
+		c-1.7,0.3-2.5,0.3-3.9,0.1c-1-0.1-1.9-0.9-1.9-1.9c0-1.1,0-3,0-4.2c0-0.5,0.9-1.6,2-1.6s2.5,0,3.8,0c1.5,0,2.4-1.4,2.4-2.8
+		c0-0.4,0-2.2,0-2.2c0.5,0,1.2,0,1.7,0C18.5,6.9,19,8,19,8.9c0,1.3,0,2.7,0,4.1c0,1-0.7,2.1-1.9,2.1
+		C15.7,15.1,10.9,15.1,10.9,15.1z"/>
+</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/r-kernel.svg b/packages/ui-components/style/icons/filetype/r-kernel.svg
new file mode 100644
index 000000000000..28353efbe037
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/r-kernel.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+<g class="jp-icon-contrast3 jp-icon-selectable" fill="#2196F3">
+	<path d="M4.4,2.5c1.2-0.1,2.9-0.3,4.9-0.3c2.5,0,4.1,0.4,5.2,1.3C15.5,4.2,16,5.4,16,7c0,2-1.4,3.5-2.9,4.1l0,0
+		c1.2,0.4,1.7,1.6,2.2,3c0.6,1.9,1,3.9,1.3,4.6h-3.8C12.5,18.3,12,17,11.6,15s-1.2-2.6-2.6-2.6H8.1v6.4H4.4V2.5z M8.1,9.4h1.4
+		c1.9,0,2.9-0.9,2.9-2.3s-1-2.3-2.8-2.3C8.9,4.8,8.3,4.8,8,5v4.5h0.1V9.4z"/>
+</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/react.svg b/packages/ui-components/style/icons/filetype/react.svg
new file mode 100644
index 000000000000..be0691e3aa1c
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/react.svg
@@ -0,0 +1,32 @@
+<svg version="1.1" id="Layer_2_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="150 150 541.9 295.3" enable-background="new 0 0 841.9 595.3" xml:space="preserve">
+	<g class="jp-icon-brand2 jp-icon-selectable" fill="#61DAFB">
+		<path d="M666.3,296.5c0-32.5-40.7-63.3-103.1-82.4c14.4-63.6,8-114.2-20.2-130.4c-6.5-3.8-14.1-5.6-22.4-5.6v22.3
+			c4.6,0,8.3,0.9,11.4,2.6c13.6,7.8,19.5,37.5,14.9,75.7c-1.1,9.4-2.9,19.3-5.1,29.4c-19.6-4.8-41-8.5-63.5-10.9
+			c-13.5-18.5-27.5-35.3-41.6-50c32.6-30.3,63.2-46.9,84-46.9l0-22.3c0,0,0,0,0,0c-27.5,0-63.5,19.6-99.9,53.6
+			c-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7,0,51.4,16.5,84,46.6c-14,14.7-28,31.4-41.3,49.9c-22.6,2.4-44,6.1-63.6,11
+			c-2.3-10-4-19.7-5.2-29c-4.7-38.2,1.1-67.9,14.6-75.8c3-1.8,6.9-2.6,11.5-2.6l0-22.3c0,0,0,0,0,0c-8.4,0-16,1.8-22.6,5.6
+			c-28.1,16.2-34.4,66.7-19.9,130.1c-62.2,19.2-102.7,49.9-102.7,82.3c0,32.5,40.7,63.3,103.1,82.4c-14.4,63.6-8,114.2,20.2,130.4
+			c6.5,3.8,14.1,5.6,22.5,5.6c27.5,0,63.5-19.6,99.9-53.6c36.4,33.8,72.4,53.2,99.9,53.2c8.4,0,16-1.8,22.6-5.6
+			c28.1-16.2,34.4-66.7,19.9-130.1C625.8,359.7,666.3,328.9,666.3,296.5z M536.1,229.8c-3.7,12.9-8.3,26.2-13.5,39.5
+			c-4.1-8-8.4-16-13.1-24c-4.6-8-9.5-15.8-14.4-23.4C509.3,224,523,226.6,536.1,229.8z M490.3,336.3c-7.8,13.5-15.8,26.3-24.1,38.2
+			c-14.9,1.3-30,2-45.2,2c-15.1,0-30.2-0.7-45-1.9c-8.3-11.9-16.4-24.6-24.2-38c-7.6-13.1-14.5-26.4-20.8-39.8
+			c6.2-13.4,13.2-26.8,20.7-39.9c7.8-13.5,15.8-26.3,24.1-38.2c14.9-1.3,30-2,45.2-2c15.1,0,30.2,0.7,45,1.9
+			c8.3,11.9,16.4,24.6,24.2,38c7.6,13.1,14.5,26.4,20.8,39.8C504.7,309.8,497.8,323.2,490.3,336.3z M522.6,323.3
+			c5.4,13.4,10,26.8,13.8,39.8c-13.1,3.2-26.9,5.9-41.2,8c4.9-7.7,9.8-15.6,14.4-23.7C514.2,339.4,518.5,331.3,522.6,323.3z
+			 M421.2,430c-9.3-9.6-18.6-20.3-27.8-32c9,0.4,18.2,0.7,27.5,0.7c9.4,0,18.7-0.2,27.8-0.7C439.7,409.7,430.4,420.4,421.2,430z
+			 M346.8,371.1c-14.2-2.1-27.9-4.7-41-7.9c3.7-12.9,8.3-26.2,13.5-39.5c4.1,8,8.4,16,13.1,24C337.1,355.7,341.9,363.5,346.8,371.1z
+			 M420.7,163c9.3,9.6,18.6,20.3,27.8,32c-9-0.4-18.2-0.7-27.5-0.7c-9.4,0-18.7,0.2-27.8,0.7C402.2,183.3,411.5,172.6,420.7,163z
+			 M346.7,221.9c-4.9,7.7-9.8,15.6-14.4,23.7c-4.6,8-8.9,16-13,24c-5.4-13.4-10-26.8-13.8-39.8C318.6,226.7,332.4,224,346.7,221.9z
+			 M256.2,347.1c-35.4-15.1-58.3-34.9-58.3-50.6c0-15.7,22.9-35.6,58.3-50.6c8.6-3.7,18-7,27.7-10.1c5.7,19.6,13.2,40,22.5,60.9
+			c-9.2,20.8-16.6,41.1-22.2,60.6C274.3,354.2,264.9,350.8,256.2,347.1z M310,490c-13.6-7.8-19.5-37.5-14.9-75.7
+			c1.1-9.4,2.9-19.3,5.1-29.4c19.6,4.8,41,8.5,63.5,10.9c13.5,18.5,27.5,35.3,41.6,50c-32.6,30.3-63.2,46.9-84,46.9
+			C316.8,492.6,313,491.7,310,490z M547.2,413.8c4.7,38.2-1.1,67.9-14.6,75.8c-3,1.8-6.9,2.6-11.5,2.6c-20.7,0-51.4-16.5-84-46.6
+			c14-14.7,28-31.4,41.3-49.9c22.6-2.4,44-6.1,63.6-11C544.3,394.8,546.1,404.5,547.2,413.8z M585.7,347.1c-8.6,3.7-18,7-27.7,10.1
+			c-5.7-19.6-13.2-40-22.5-60.9c9.2-20.8,16.6-41.1,22.2-60.6c9.9,3.1,19.3,6.5,28.1,10.2c35.4,15.1,58.3,34.9,58.3,50.6
+			C644,312.2,621.1,332.1,585.7,347.1z"/>
+		<polygon points="320.8,78.4 320.8,78.4 320.8,78.4 	"/>
+		<circle cx="420.9" cy="296.5" r="45.7"/>
+		<polygon points="520.5,78.1 520.5,78.1 520.5,78.1 	"/>
+	</g>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/spreadsheet.svg b/packages/ui-components/style/icons/filetype/spreadsheet.svg
new file mode 100644
index 000000000000..97b81167ca2a
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/spreadsheet.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<path class="jp-icon-contrast1 jp-icon-selectable" fill="#4CAF50" d="M2.2,2.2v17.6h17.6V2.2C19.8,2.2,2.2,2.2,2.2,2.2z M17.6,9.9h-5.5V4.4h5.5V9.9z M9.9,4.4v5.5H4.4V4.4
+		C4.4,4.4,9.9,4.4,9.9,4.4z M4.4,12.1h5.5v5.5H4.4L4.4,12.1z M12.1,17.6v-5.5h5.5v5.5H12.1z"/>
+</svg>
diff --git a/packages/ui-components/style/icons/filetype/yaml.svg b/packages/ui-components/style/icons/filetype/yaml.svg
new file mode 100644
index 000000000000..9a1772a39826
--- /dev/null
+++ b/packages/ui-components/style/icons/filetype/yaml.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
+	<g class="jp-icon-contrast2 jp-icon-selectable" fill="#D81B60">
+		<path d="M7.2,18.6v-5.4L3,5.6h3.3l1.4,3.1c0.3,0.9,0.6,1.6,1,2.5l0,0c0.3-0.8,0.6-1.6,1-2.5l1.4-3.1h3.4l-4.4,7.6v5.5
+			L7.2,18.6L7.2,18.6z"/>
+		<circle class="st0" cx="17.6" cy="16.5" r="2.1"/>
+		<circle class="st0" cx="17.6" cy="11" r="2.1"/>
+	</g>
+</svg>
diff --git a/packages/ui-components/style/icons/sidebar/build.svg b/packages/ui-components/style/icons/sidebar/build.svg
new file mode 100755
index 000000000000..32ddc5709bea
--- /dev/null
+++ b/packages/ui-components/style/icons/sidebar/build.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        class="jp-icon3"
+        fill="#616161"
+        d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"
+    />
+</svg>
diff --git a/packages/ui-components/style/icons/sidebar/extension.svg b/packages/ui-components/style/icons/sidebar/extension.svg
new file mode 100644
index 000000000000..e7c930bdad64
--- /dev/null
+++ b/packages/ui-components/style/icons/sidebar/extension.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        class="jp-icon3"
+        fill="#616161"
+        d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2.7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z"
+    />
+</svg>
diff --git a/packages/ui-components/style/icons/sidebar/palette.svg b/packages/ui-components/style/icons/sidebar/palette.svg
new file mode 100644
index 000000000000..bccca056d078
--- /dev/null
+++ b/packages/ui-components/style/icons/sidebar/palette.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        class="jp-icon3"
+        fill="#616161"
+        d="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5 0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83.67-1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5.67 1.5 1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5.67 1.5 1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"
+    />
+</svg>
diff --git a/packages/ui-components/style/icons/sidebar/running.svg b/packages/ui-components/style/icons/sidebar/running.svg
new file mode 100644
index 000000000000..b10ef9c297cb
--- /dev/null
+++ b/packages/ui-components/style/icons/sidebar/running.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="bar">
+    <path
+        class="jp-icon3"
+        fill="#616161"
+        d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm96 328c0 8.8-7.2 16-16 16H176c-8.8 0-16-7.2-16-16V176c0-8.8 7.2-16 16-16h160c8.8 0 16 7.2 16 16v160z"
+    ></path>>
+</svg>
diff --git a/packages/ui-components/style/icons/sidebar/tab.svg b/packages/ui-components/style/icons/sidebar/tab.svg
new file mode 100644
index 000000000000..4ce0b473dcb6
--- /dev/null
+++ b/packages/ui-components/style/icons/sidebar/tab.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path
+        class="jp-icon3"
+        fill="#616161"
+        d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h10v4h8v10z"
+    />
+</svg>
diff --git a/packages/ui-components/style/icons/splash/jupyter-favicon.svg b/packages/ui-components/style/icons/splash/jupyter-favicon.svg
new file mode 100644
index 000000000000..755b30eec9ca
--- /dev/null
+++ b/packages/ui-components/style/icons/splash/jupyter-favicon.svg
@@ -0,0 +1,5 @@
+<svg width="152" height="165" viewBox="0 0 152 165" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Jupyter Favicon</title>
+    <path class="jp-icon-warn0" transform="translate(0.078947, 110.582927)" fill="#F37726" d="M75.9422842,29.5804561 C43.3023947,29.5804561 14.7967832,17.6534634 0,0 C5.51083211,15.8406829 15.7815389,29.5667732 29.3904947,39.2784171 C42.9997,48.9898537 59.2737,54.2067805 75.9605789,54.2067805 C92.6474579,54.2067805 108.921458,48.9898537 122.530663,39.2784171 C136.139453,29.5667732 146.410284,15.8406829 151.921158,0 C137.087868,17.6534634 108.582589,29.5804561 75.9422842,29.5804561 L75.9422842,29.5804561 Z" id="path1_fill" />
+    <path class="jp-icon-warn0" transform="translate(0.037368, 0.704878)" fill="#F37726" d="M75.9784579,24.6264073 C108.618763,24.6264073 137.124458,36.5534415 151.921158,54.2067805 C146.410284,38.366222 136.139453,24.6401317 122.530663,14.9284878 C108.921458,5.2168439 92.6474579,0 75.9605789,0 C59.2737,0 42.9997,5.2168439 29.3904947,14.9284878 C15.7815389,24.6401317 5.51083211,38.366222 0,54.2067805 C14.8330816,36.5899293 43.3385684,24.6264073 75.9784579,24.6264073 L75.9784579,24.6264073 Z" id="path2_fill" />
+</svg>
diff --git a/packages/ui-components/style/icons/statusbar/kernel.svg b/packages/ui-components/style/icons/statusbar/kernel.svg
new file mode 100644
index 000000000000..e97ce48f2349
--- /dev/null
+++ b/packages/ui-components/style/icons/statusbar/kernel.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path class="jp-icon2" fill="#616161" d="M15 9H9v6h6V9zm-2 4h-2v-2h2v2zm8-2V9h-2V7c0-1.1-.9-2-2-2h-2V3h-2v2h-2V3H9v2H7c-1.1 0-2 .9-2 2v2H3v2h2v2H3v2h2v2c0 1.1.9 2 2 2h2v2h2v-2h2v2h2v-2h2c1.1 0 2-.9 2-2v-2h2v-2h-2v-2h2zm-4 6H7V7h10v10z"/>
+</svg>
diff --git a/packages/statusbar/style/line-form.svg b/packages/ui-components/style/icons/statusbar/line-form.svg
similarity index 57%
rename from packages/statusbar/style/line-form.svg
rename to packages/ui-components/style/icons/statusbar/line-form.svg
index 7491cb849bab..b4fd1ef77088 100644
--- a/packages/statusbar/style/line-form.svg
+++ b/packages/ui-components/style/icons/statusbar/line-form.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path class="jp-icon-main" fill="white" d="M5.88 4.12L13.76 12l-7.88 7.88L8 22l10-10L8 2z"/>
+    <path fill="white" d="M5.88 4.12L13.76 12l-7.88 7.88L8 22l10-10L8 2z"/>
     <path fill="none" d="M0 0h24v24H0z"/>
 </svg>
diff --git a/packages/ui-components/style/icons/statusbar/not-trusted.svg b/packages/ui-components/style/icons/statusbar/not-trusted.svg
new file mode 100644
index 000000000000..4a0936fee37a
--- /dev/null
+++ b/packages/ui-components/style/icons/statusbar/not-trusted.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path class="jp-icon2" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.33319 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(3 3)" stroke="#333333" stroke-width="2"/>
+    <path class="jp-icon2" d="M7.36842 0L0 7.36479" transform="translate(9.31592 9.32031)" stroke="#333333" stroke-width="2"/>
+    <path class="jp-icon2" d="M7.36842 0L0 7.36479" transform="translate(9.31592 16.6836) scale(1 -1)" stroke="#333333" stroke-width="2"/>
+</svg>
diff --git a/packages/ui-components/style/icons/statusbar/terminal.svg b/packages/ui-components/style/icons/statusbar/terminal.svg
new file mode 100644
index 000000000000..e8d49b4e91a1
--- /dev/null
+++ b/packages/ui-components/style/icons/statusbar/terminal.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect class="jp-icon2 jp-icon-selectable" width="20" height="20" transform="translate(2 2)" fill="#333333"/>
+    <path class="jp-icon-accent2 jp-icon-selectable-inverse" d="M5.05664 8.76172C5.05664 8.59766 5.03125 8.45312 4.98047 8.32812C4.93359 8.19922 4.85547 8.08203 4.74609 7.97656C4.64062 7.87109 4.5 7.77539 4.32422 7.68945C4.15234 7.59961 3.94336 7.51172 3.69727 7.42578C3.30273 7.28516 2.94336 7.13672 2.61914 6.98047C2.29492 6.82422 2.01758 6.64258 1.78711 6.43555C1.56055 6.22852 1.38477 5.98828 1.25977 5.71484C1.13477 5.4375 1.07227 5.10938 1.07227 4.73047C1.07227 4.39844 1.12891 4.0957 1.24219 3.82227C1.35547 3.54492 1.51562 3.30469 1.72266 3.10156C1.92969 2.89844 2.17969 2.73437 2.47266 2.60938C2.76562 2.48438 3.0918 2.4043 3.45117 2.36914V1.10938H4.38867V2.38086C4.74023 2.42773 5.05664 2.52344 5.33789 2.66797C5.61914 2.8125 5.85742 3.00195 6.05273 3.23633C6.25195 3.4668 6.4043 3.74023 6.50977 4.05664C6.61914 4.36914 6.67383 4.7207 6.67383 5.11133H5.04492C5.04492 4.63867 4.9375 4.28125 4.72266 4.03906C4.50781 3.79297 4.2168 3.66992 3.84961 3.66992C3.65039 3.66992 3.47656 3.69727 3.32812 3.75195C3.18359 3.80273 3.06445 3.87695 2.9707 3.97461C2.87695 4.06836 2.80664 4.17969 2.75977 4.30859C2.7168 4.4375 2.69531 4.57812 2.69531 4.73047C2.69531 4.88281 2.7168 5.01953 2.75977 5.14062C2.80664 5.25781 2.88281 5.36719 2.98828 5.46875C3.09766 5.57031 3.24023 5.66797 3.41602 5.76172C3.5918 5.85156 3.81055 5.94336 4.07227 6.03711C4.4668 6.18555 4.82422 6.33984 5.14453 6.5C5.46484 6.65625 5.73828 6.83984 5.96484 7.05078C6.19531 7.25781 6.37109 7.5 6.49219 7.77734C6.61719 8.05078 6.67969 8.375 6.67969 8.75C6.67969 9.09375 6.62305 9.4043 6.50977 9.68164C6.39648 9.95508 6.23438 10.1914 6.02344 10.3906C5.8125 10.5898 5.55859 10.75 5.26172 10.8711C4.96484 10.9883 4.63281 11.0645 4.26562 11.0996V12.248H3.33398V11.0996C3.00195 11.0684 2.67969 10.9961 2.36719 10.8828C2.05469 10.7656 1.77734 10.5977 1.53516 10.3789C1.29688 10.1602 1.10547 9.88477 0.960938 9.55273C0.816406 9.2168 0.744141 8.81445 0.744141 8.3457H2.37891C2.37891 8.62695 2.41992 8.86328 2.50195 9.05469C2.58398 9.24219 2.68945 9.39258 2.81836 9.50586C2.95117 9.61523 3.10156 9.69336 3.26953 9.74023C3.4375 9.78711 3.60938 9.81055 3.78516 9.81055C4.20312 9.81055 4.51953 9.71289 4.73438 9.51758C4.94922 9.32227 5.05664 9.07031 5.05664 8.76172ZM13.418 12.2715H8.07422V11H13.418V12.2715Z" transform="translate(3.95264 6)" fill="white"/>
+</svg>
diff --git a/packages/ui-components/style/icons/statusbar/trusted.svg b/packages/ui-components/style/icons/statusbar/trusted.svg
new file mode 100644
index 000000000000..8da29db6c18f
--- /dev/null
+++ b/packages/ui-components/style/icons/statusbar/trusted.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path class="jp-icon2" d="M1.86094 11.4409C0.826448 8.77027 0.863779 6.05764 1.24907 4.19932C2.48206 3.93347 4.08068 3.40347 5.60102 2.8449C7.23549 2.2444 8.85666 1.5815 9.9876 1.09539C11.0597 1.58341 12.6094 2.2444 14.218 2.84339C15.7503 3.41394 17.3995 3.95258 18.7539 4.21385C19.1364 6.07177 19.1709 8.77722 18.139 11.4409C17.0303 14.3032 14.6668 17.1844 9.99999 18.9354C5.3332 17.1844 2.96968 14.3032 1.86094 11.4409Z" transform="translate(2 3)" stroke="#333333" stroke-width="2"/>
+    <path class="jp-icon2" d="M2.86015 4.86535L0.726549 2.99959L0 3.63045L2.86015 6.13157L8 0.630872L7.27857 0L2.86015 4.86535Z" transform="translate(8 9.86719)" fill="#333333" stroke="#333333"/>
+</svg>
diff --git a/packages/ui-components/style/index.css b/packages/ui-components/style/index.css
index ee417b10abe9..f7e375acb680 100644
--- a/packages/ui-components/style/index.css
+++ b/packages/ui-components/style/index.css
@@ -5,7 +5,7 @@
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@blueprintjs/core/lib/css/blueprint.css');
-@import url('~@blueprintjs/icons/lib/css/blueprint-icons.css');
 @import url('~@blueprintjs/select/lib/css/blueprint-select.css');
+@import url('~@phosphor/widgets/style/index.css');
 
 @import url('./base.css');
diff --git a/packages/ui-components/tdoptions.json b/packages/ui-components/tdoptions.json
index 60d100d16c84..330558b24eac 100644
--- a/packages/ui-components/tdoptions.json
+++ b/packages/ui-components/tdoptions.json
@@ -7,7 +7,8 @@
     "lib.es2015.d.ts",
     "lib.es2015.collection.d.ts",
     "lib.es2015.promise.d.ts",
-    "lib.dom.d.ts"
+    "lib.dom.d.ts",
+    "lib.dom.iterable.d.ts"
   ],
   "out": "../../docs/api/ui-components",
   "baseUrl": ".",
@@ -16,5 +17,5 @@
   },
   "esModuleInterop": true,
   "jsx": "react",
-  "types": ["webpack-env"]
+  "types": ["webpack-env", "node"]
 }
diff --git a/packages/ui-components/tsconfig.json b/packages/ui-components/tsconfig.json
index b25ed53167d9..3460c40ab1d8 100644
--- a/packages/ui-components/tsconfig.json
+++ b/packages/ui-components/tsconfig.json
@@ -2,9 +2,13 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "types": ["webpack-env"],
+    "types": ["webpack-env", "node"],
     "rootDir": "src"
   },
-  "include": ["src/*"],
-  "references": []
+  "include": ["src/**/*"],
+  "references": [
+    {
+      "path": "../coreutils"
+    }
+  ]
 }
diff --git a/packages/vdom-extension/src/index.ts b/packages/vdom-extension/src/index.ts
index 682cd834130a..8b009b2cf1cd 100644
--- a/packages/vdom-extension/src/index.ts
+++ b/packages/vdom-extension/src/index.ts
@@ -18,9 +18,9 @@ import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { RenderedVDOM, IVDOMTracker } from '@jupyterlab/vdom';
 
 /**
- * The CSS class for a VDOM icon.
+ * The name for a VDOM icon.
  */
-const CSS_ICON_CLASS = 'jp-MaterialIcon jp-VDOMIcon';
+const ICON_NAME = 'react';
 
 /**
  * The MIME type for VDOM.
@@ -34,14 +34,15 @@ const FACTORY_NAME = 'VDOM';
 
 const plugin: JupyterFrontEndPlugin<IVDOMTracker> = {
   id: '@jupyterlab/vdom-extension:factory',
-  requires: [IRenderMimeRegistry, INotebookTracker, ILayoutRestorer],
+  requires: [IRenderMimeRegistry],
+  optional: [INotebookTracker, ILayoutRestorer],
   provides: IVDOMTracker,
   autoStart: true,
   activate: (
     app: JupyterFrontEnd,
     rendermime: IRenderMimeRegistry,
-    notebooks: INotebookTracker,
-    restorer: ILayoutRestorer
+    notebooks: INotebookTracker | null,
+    restorer: ILayoutRestorer | null
   ) => {
     const tracker = new WidgetTracker<MimeDocument>({
       namespace: 'vdom-widget'
@@ -57,29 +58,31 @@ const plugin: JupyterFrontEndPlugin<IVDOMTracker> = {
       0
     );
 
-    notebooks.widgetAdded.connect((sender, panel) => {
-      // Get the notebook's context and rendermime;
-      const {
-        context,
-        content: { rendermime }
-      } = panel;
-
-      // Add the renderer factory to the notebook's rendermime registry;
-      rendermime.addFactory(
-        {
-          safe: false,
-          mimeTypes: [MIME_TYPE],
-          createRenderer: options => new RenderedVDOM(options, context)
-        },
-        0
-      );
-    });
+    if (notebooks) {
+      notebooks.widgetAdded.connect((sender, panel) => {
+        // Get the notebook's context and rendermime;
+        const {
+          context,
+          content: { rendermime }
+        } = panel;
+
+        // Add the renderer factory to the notebook's rendermime registry;
+        rendermime.addFactory(
+          {
+            safe: false,
+            mimeTypes: [MIME_TYPE],
+            createRenderer: options => new RenderedVDOM(options, context)
+          },
+          0
+        );
+      });
+    }
 
     app.docRegistry.addFileType({
       name: 'vdom',
       mimeTypes: [MIME_TYPE],
       extensions: ['.vdom', '.vdom.json'],
-      iconClass: CSS_ICON_CLASS
+      iconClass: ICON_NAME
     });
 
     const factory = new MimeDocumentFactory({
@@ -87,7 +90,7 @@ const plugin: JupyterFrontEndPlugin<IVDOMTracker> = {
       dataType: 'json',
       rendermime,
       name: FACTORY_NAME,
-      primaryFileType: app.docRegistry.getFileType('vdom'),
+      primaryFileType: app.docRegistry.getFileType('vdom')!,
       fileTypes: ['vdom', 'json'],
       defaultFor: ['vdom']
     });
@@ -102,15 +105,17 @@ const plugin: JupyterFrontEndPlugin<IVDOMTracker> = {
     // Add widget factory to document registry.
     app.docRegistry.addWidgetFactory(factory);
 
-    // Handle state restoration.
-    void restorer.restore(tracker, {
-      command: 'docmanager:open',
-      args: widget => ({
-        path: widget.context.path,
-        factory: FACTORY_NAME
-      }),
-      name: widget => widget.context.path
-    });
+    if (restorer) {
+      // Handle state restoration.
+      void restorer.restore(tracker, {
+        command: 'docmanager:open',
+        args: widget => ({
+          path: widget.context.path,
+          factory: FACTORY_NAME
+        }),
+        name: widget => widget.context.path
+      });
+    }
 
     return tracker;
   }
diff --git a/packages/vdom-extension/style/base.css b/packages/vdom-extension/style/base.css
deleted file mode 100644
index 3aa74aba24ad..000000000000
--- a/packages/vdom-extension/style/base.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-  Copyright (c) Jupyter Development Team.
-  Distributed under the terms of the Modified BSD License.
-*/
-
-/* Add CSS variables to :root */
-:root {
-  --jp-icon-vdom: url('./react.svg');
-}
-
-/* Base styles */
-.jp-RenderedVDOM {
-  width: 100%;
-  height: 100%;
-  padding: 0;
-  overflow: auto;
-}
-
-/* Document styles */
-.jp-MimeDocument .jp-RenderedVDOM {
-  padding: 5px;
-}
-
-/* Document icon */
-.jp-VDOMIcon {
-  background-image: var(--jp-icon-vdom);
-  background-size: 24px;
-  background-position: center !important;
-}
diff --git a/packages/vdom-extension/style/index.css b/packages/vdom-extension/style/index.css
index c6533b9403f0..6300595458a5 100644
--- a/packages/vdom-extension/style/index.css
+++ b/packages/vdom-extension/style/index.css
@@ -10,5 +10,3 @@
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/notebook/style/index.css');
 @import url('~@jupyterlab/vdom/style/index.css');
-
-@import url('./base.css');
diff --git a/packages/vdom-extension/style/react.svg b/packages/vdom-extension/style/react.svg
deleted file mode 100644
index 5592ebec6d60..000000000000
--- a/packages/vdom-extension/style/react.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_2_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 841.9 595.3" enable-background="new 0 0 841.9 595.3" xml:space="preserve">
-<g>
-	<path fill="#61DAFB" d="M666.3,296.5c0-32.5-40.7-63.3-103.1-82.4c14.4-63.6,8-114.2-20.2-130.4c-6.5-3.8-14.1-5.6-22.4-5.6v22.3
-		c4.6,0,8.3,0.9,11.4,2.6c13.6,7.8,19.5,37.5,14.9,75.7c-1.1,9.4-2.9,19.3-5.1,29.4c-19.6-4.8-41-8.5-63.5-10.9
-		c-13.5-18.5-27.5-35.3-41.6-50c32.6-30.3,63.2-46.9,84-46.9l0-22.3c0,0,0,0,0,0c-27.5,0-63.5,19.6-99.9,53.6
-		c-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7,0,51.4,16.5,84,46.6c-14,14.7-28,31.4-41.3,49.9c-22.6,2.4-44,6.1-63.6,11
-		c-2.3-10-4-19.7-5.2-29c-4.7-38.2,1.1-67.9,14.6-75.8c3-1.8,6.9-2.6,11.5-2.6l0-22.3c0,0,0,0,0,0c-8.4,0-16,1.8-22.6,5.6
-		c-28.1,16.2-34.4,66.7-19.9,130.1c-62.2,19.2-102.7,49.9-102.7,82.3c0,32.5,40.7,63.3,103.1,82.4c-14.4,63.6-8,114.2,20.2,130.4
-		c6.5,3.8,14.1,5.6,22.5,5.6c27.5,0,63.5-19.6,99.9-53.6c36.4,33.8,72.4,53.2,99.9,53.2c8.4,0,16-1.8,22.6-5.6
-		c28.1-16.2,34.4-66.7,19.9-130.1C625.8,359.7,666.3,328.9,666.3,296.5z M536.1,229.8c-3.7,12.9-8.3,26.2-13.5,39.5
-		c-4.1-8-8.4-16-13.1-24c-4.6-8-9.5-15.8-14.4-23.4C509.3,224,523,226.6,536.1,229.8z M490.3,336.3c-7.8,13.5-15.8,26.3-24.1,38.2
-		c-14.9,1.3-30,2-45.2,2c-15.1,0-30.2-0.7-45-1.9c-8.3-11.9-16.4-24.6-24.2-38c-7.6-13.1-14.5-26.4-20.8-39.8
-		c6.2-13.4,13.2-26.8,20.7-39.9c7.8-13.5,15.8-26.3,24.1-38.2c14.9-1.3,30-2,45.2-2c15.1,0,30.2,0.7,45,1.9
-		c8.3,11.9,16.4,24.6,24.2,38c7.6,13.1,14.5,26.4,20.8,39.8C504.7,309.8,497.8,323.2,490.3,336.3z M522.6,323.3
-		c5.4,13.4,10,26.8,13.8,39.8c-13.1,3.2-26.9,5.9-41.2,8c4.9-7.7,9.8-15.6,14.4-23.7C514.2,339.4,518.5,331.3,522.6,323.3z
-		 M421.2,430c-9.3-9.6-18.6-20.3-27.8-32c9,0.4,18.2,0.7,27.5,0.7c9.4,0,18.7-0.2,27.8-0.7C439.7,409.7,430.4,420.4,421.2,430z
-		 M346.8,371.1c-14.2-2.1-27.9-4.7-41-7.9c3.7-12.9,8.3-26.2,13.5-39.5c4.1,8,8.4,16,13.1,24C337.1,355.7,341.9,363.5,346.8,371.1z
-		 M420.7,163c9.3,9.6,18.6,20.3,27.8,32c-9-0.4-18.2-0.7-27.5-0.7c-9.4,0-18.7,0.2-27.8,0.7C402.2,183.3,411.5,172.6,420.7,163z
-		 M346.7,221.9c-4.9,7.7-9.8,15.6-14.4,23.7c-4.6,8-8.9,16-13,24c-5.4-13.4-10-26.8-13.8-39.8C318.6,226.7,332.4,224,346.7,221.9z
-		 M256.2,347.1c-35.4-15.1-58.3-34.9-58.3-50.6c0-15.7,22.9-35.6,58.3-50.6c8.6-3.7,18-7,27.7-10.1c5.7,19.6,13.2,40,22.5,60.9
-		c-9.2,20.8-16.6,41.1-22.2,60.6C274.3,354.2,264.9,350.8,256.2,347.1z M310,490c-13.6-7.8-19.5-37.5-14.9-75.7
-		c1.1-9.4,2.9-19.3,5.1-29.4c19.6,4.8,41,8.5,63.5,10.9c13.5,18.5,27.5,35.3,41.6,50c-32.6,30.3-63.2,46.9-84,46.9
-		C316.8,492.6,313,491.7,310,490z M547.2,413.8c4.7,38.2-1.1,67.9-14.6,75.8c-3,1.8-6.9,2.6-11.5,2.6c-20.7,0-51.4-16.5-84-46.6
-		c14-14.7,28-31.4,41.3-49.9c22.6-2.4,44-6.1,63.6-11C544.3,394.8,546.1,404.5,547.2,413.8z M585.7,347.1c-8.6,3.7-18,7-27.7,10.1
-		c-5.7-19.6-13.2-40-22.5-60.9c9.2-20.8,16.6-41.1,22.2-60.6c9.9,3.1,19.3,6.5,28.1,10.2c35.4,15.1,58.3,34.9,58.3,50.6
-		C644,312.2,621.1,332.1,585.7,347.1z"/>
-	<polygon fill="#61DAFB" points="320.8,78.4 320.8,78.4 320.8,78.4 	"/>
-	<circle fill="#61DAFB" cx="420.9" cy="296.5" r="45.7"/>
-	<polygon fill="#61DAFB" points="520.5,78.1 520.5,78.1 520.5,78.1 	"/>
-</g>
-</svg>
diff --git a/packages/vdom/style/base.css b/packages/vdom/style/base.css
index 3aa74aba24ad..850eccd402f0 100644
--- a/packages/vdom/style/base.css
+++ b/packages/vdom/style/base.css
@@ -3,11 +3,6 @@
   Distributed under the terms of the Modified BSD License.
 */
 
-/* Add CSS variables to :root */
-:root {
-  --jp-icon-vdom: url('./react.svg');
-}
-
 /* Base styles */
 .jp-RenderedVDOM {
   width: 100%;
@@ -20,10 +15,3 @@
 .jp-MimeDocument .jp-RenderedVDOM {
   padding: 5px;
 }
-
-/* Document icon */
-.jp-VDOMIcon {
-  background-image: var(--jp-icon-vdom);
-  background-size: 24px;
-  background-position: center !important;
-}
diff --git a/packages/vdom/style/react.svg b/packages/vdom/style/react.svg
deleted file mode 100644
index 5592ebec6d60..000000000000
--- a/packages/vdom/style/react.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_2_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 841.9 595.3" enable-background="new 0 0 841.9 595.3" xml:space="preserve">
-<g>
-	<path fill="#61DAFB" d="M666.3,296.5c0-32.5-40.7-63.3-103.1-82.4c14.4-63.6,8-114.2-20.2-130.4c-6.5-3.8-14.1-5.6-22.4-5.6v22.3
-		c4.6,0,8.3,0.9,11.4,2.6c13.6,7.8,19.5,37.5,14.9,75.7c-1.1,9.4-2.9,19.3-5.1,29.4c-19.6-4.8-41-8.5-63.5-10.9
-		c-13.5-18.5-27.5-35.3-41.6-50c32.6-30.3,63.2-46.9,84-46.9l0-22.3c0,0,0,0,0,0c-27.5,0-63.5,19.6-99.9,53.6
-		c-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7,0,51.4,16.5,84,46.6c-14,14.7-28,31.4-41.3,49.9c-22.6,2.4-44,6.1-63.6,11
-		c-2.3-10-4-19.7-5.2-29c-4.7-38.2,1.1-67.9,14.6-75.8c3-1.8,6.9-2.6,11.5-2.6l0-22.3c0,0,0,0,0,0c-8.4,0-16,1.8-22.6,5.6
-		c-28.1,16.2-34.4,66.7-19.9,130.1c-62.2,19.2-102.7,49.9-102.7,82.3c0,32.5,40.7,63.3,103.1,82.4c-14.4,63.6-8,114.2,20.2,130.4
-		c6.5,3.8,14.1,5.6,22.5,5.6c27.5,0,63.5-19.6,99.9-53.6c36.4,33.8,72.4,53.2,99.9,53.2c8.4,0,16-1.8,22.6-5.6
-		c28.1-16.2,34.4-66.7,19.9-130.1C625.8,359.7,666.3,328.9,666.3,296.5z M536.1,229.8c-3.7,12.9-8.3,26.2-13.5,39.5
-		c-4.1-8-8.4-16-13.1-24c-4.6-8-9.5-15.8-14.4-23.4C509.3,224,523,226.6,536.1,229.8z M490.3,336.3c-7.8,13.5-15.8,26.3-24.1,38.2
-		c-14.9,1.3-30,2-45.2,2c-15.1,0-30.2-0.7-45-1.9c-8.3-11.9-16.4-24.6-24.2-38c-7.6-13.1-14.5-26.4-20.8-39.8
-		c6.2-13.4,13.2-26.8,20.7-39.9c7.8-13.5,15.8-26.3,24.1-38.2c14.9-1.3,30-2,45.2-2c15.1,0,30.2,0.7,45,1.9
-		c8.3,11.9,16.4,24.6,24.2,38c7.6,13.1,14.5,26.4,20.8,39.8C504.7,309.8,497.8,323.2,490.3,336.3z M522.6,323.3
-		c5.4,13.4,10,26.8,13.8,39.8c-13.1,3.2-26.9,5.9-41.2,8c4.9-7.7,9.8-15.6,14.4-23.7C514.2,339.4,518.5,331.3,522.6,323.3z
-		 M421.2,430c-9.3-9.6-18.6-20.3-27.8-32c9,0.4,18.2,0.7,27.5,0.7c9.4,0,18.7-0.2,27.8-0.7C439.7,409.7,430.4,420.4,421.2,430z
-		 M346.8,371.1c-14.2-2.1-27.9-4.7-41-7.9c3.7-12.9,8.3-26.2,13.5-39.5c4.1,8,8.4,16,13.1,24C337.1,355.7,341.9,363.5,346.8,371.1z
-		 M420.7,163c9.3,9.6,18.6,20.3,27.8,32c-9-0.4-18.2-0.7-27.5-0.7c-9.4,0-18.7,0.2-27.8,0.7C402.2,183.3,411.5,172.6,420.7,163z
-		 M346.7,221.9c-4.9,7.7-9.8,15.6-14.4,23.7c-4.6,8-8.9,16-13,24c-5.4-13.4-10-26.8-13.8-39.8C318.6,226.7,332.4,224,346.7,221.9z
-		 M256.2,347.1c-35.4-15.1-58.3-34.9-58.3-50.6c0-15.7,22.9-35.6,58.3-50.6c8.6-3.7,18-7,27.7-10.1c5.7,19.6,13.2,40,22.5,60.9
-		c-9.2,20.8-16.6,41.1-22.2,60.6C274.3,354.2,264.9,350.8,256.2,347.1z M310,490c-13.6-7.8-19.5-37.5-14.9-75.7
-		c1.1-9.4,2.9-19.3,5.1-29.4c19.6,4.8,41,8.5,63.5,10.9c13.5,18.5,27.5,35.3,41.6,50c-32.6,30.3-63.2,46.9-84,46.9
-		C316.8,492.6,313,491.7,310,490z M547.2,413.8c4.7,38.2-1.1,67.9-14.6,75.8c-3,1.8-6.9,2.6-11.5,2.6c-20.7,0-51.4-16.5-84-46.6
-		c14-14.7,28-31.4,41.3-49.9c22.6-2.4,44-6.1,63.6-11C544.3,394.8,546.1,404.5,547.2,413.8z M585.7,347.1c-8.6,3.7-18,7-27.7,10.1
-		c-5.7-19.6-13.2-40-22.5-60.9c9.2-20.8,16.6-41.1,22.2-60.6c9.9,3.1,19.3,6.5,28.1,10.2c35.4,15.1,58.3,34.9,58.3,50.6
-		C644,312.2,621.1,332.1,585.7,347.1z"/>
-	<polygon fill="#61DAFB" points="320.8,78.4 320.8,78.4 320.8,78.4 	"/>
-	<circle fill="#61DAFB" cx="420.9" cy="296.5" r="45.7"/>
-	<polygon fill="#61DAFB" points="520.5,78.1 520.5,78.1 520.5,78.1 	"/>
-</g>
-</svg>
diff --git a/tests/test-filebrowser/package.json b/tests/test-filebrowser/package.json
index e198a68a1c9a..e04486bc16e4 100644
--- a/tests/test-filebrowser/package.json
+++ b/tests/test-filebrowser/package.json
@@ -22,6 +22,7 @@
     "@jupyterlab/filebrowser": "^1.1.0-alpha.1",
     "@jupyterlab/services": "^4.1.0-alpha.1",
     "@jupyterlab/testutils": "^1.1.0-alpha.1",
+    "@jupyterlab/ui-components": "^1.1.0-alpha.1",
     "@phosphor/algorithm": "^1.1.3",
     "@phosphor/coreutils": "^1.3.1",
     "@phosphor/messaging": "^1.2.3",
diff --git a/tests/test-filebrowser/src/crumbs.spec.ts b/tests/test-filebrowser/src/crumbs.spec.ts
index df06b2607ee6..8ce03e54c59a 100644
--- a/tests/test-filebrowser/src/crumbs.spec.ts
+++ b/tests/test-filebrowser/src/crumbs.spec.ts
@@ -7,19 +7,23 @@ import { DocumentManager, IDocumentManager } from '@jupyterlab/docmanager';
 
 import { DocumentRegistry, TextModelFactory } from '@jupyterlab/docregistry';
 
+import { BreadCrumbs, FileBrowserModel } from '@jupyterlab/filebrowser';
+
 import { ServiceManager } from '@jupyterlab/services';
 
+import { framePromise, signalToPromise } from '@jupyterlab/testutils';
+
+import { defaultIconRegistry, IIconRegistry } from '@jupyterlab/ui-components';
+
 import { Message, MessageLoop } from '@phosphor/messaging';
 
 import { Widget } from '@phosphor/widgets';
 
 import { simulate } from 'simulate-event';
 
-import { BreadCrumbs, FileBrowserModel } from '@jupyterlab/filebrowser';
-
-import { framePromise, signalToPromise } from '@jupyterlab/testutils';
-
+const HOME_ITEM_CLASS = 'jp-BreadCrumbs-home';
 const ITEM_CLASS = 'jp-BreadCrumbs-item';
+const ITEM_QUERY = `.${HOME_ITEM_CLASS}, .${ITEM_CLASS}`;
 
 class LogCrumbs extends BreadCrumbs {
   methods: string[] = [];
@@ -47,6 +51,7 @@ class LogCrumbs extends BreadCrumbs {
 }
 
 describe('filebrowser/model', () => {
+  let iconRegistry: IIconRegistry;
   let manager: IDocumentManager;
   let serviceManager: ServiceManager.IManager;
   let registry: DocumentRegistry;
@@ -68,6 +73,7 @@ describe('filebrowser/model', () => {
       textModelFactory: new TextModelFactory()
     });
     serviceManager = new ServiceManager({ standby: 'never' });
+    iconRegistry = defaultIconRegistry;
     manager = new DocumentManager({
       registry,
       opener,
@@ -91,7 +97,7 @@ describe('filebrowser/model', () => {
   });
 
   beforeEach(async () => {
-    model = new FileBrowserModel({ manager });
+    model = new FileBrowserModel({ iconRegistry, manager });
     await model.cd(path);
     crumbs = new LogCrumbs({ model });
   });
@@ -105,7 +111,7 @@ describe('filebrowser/model', () => {
       it('should create a new BreadCrumbs instance', () => {
         const bread = new BreadCrumbs({ model });
         expect(bread).to.be.an.instanceof(BreadCrumbs);
-        const items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+        const items = crumbs.node.querySelectorAll(ITEM_QUERY);
         expect(items.length).to.equal(1);
       });
 
@@ -119,26 +125,26 @@ describe('filebrowser/model', () => {
         it('should switch to the parent directory', async () => {
           Widget.attach(crumbs, document.body);
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          let items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          let items = crumbs.node.querySelectorAll(ITEM_QUERY);
           expect(items.length).to.equal(4);
           const promise = signalToPromise(model.pathChanged);
           expect(items[2].textContent).to.equal(second);
           simulate(items[2], 'click');
           await promise;
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          items = crumbs.node.querySelectorAll(ITEM_QUERY);
           expect(items.length).to.equal(3);
         });
 
         it('should switch to the home directory', async () => {
           Widget.attach(crumbs, document.body);
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          let items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          let items = crumbs.node.querySelectorAll(ITEM_QUERY);
           const promise = signalToPromise(model.pathChanged);
           simulate(items[0], 'click');
           await promise;
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          items = crumbs.node.querySelectorAll(ITEM_QUERY);
           expect(items.length).to.equal(1);
           expect(model.path).to.equal('');
         });
@@ -146,12 +152,12 @@ describe('filebrowser/model', () => {
         it('should switch to the grandparent directory', async () => {
           Widget.attach(crumbs, document.body);
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          let items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          let items = crumbs.node.querySelectorAll(ITEM_QUERY);
           const promise = signalToPromise(model.pathChanged);
           simulate(items[1], 'click');
           await promise;
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          items = crumbs.node.querySelectorAll(ITEM_QUERY);
           expect(items.length).to.equal(2);
           expect(model.path).to.equal(first);
         });
@@ -159,13 +165,13 @@ describe('filebrowser/model', () => {
         it('should refresh the current directory', async () => {
           Widget.attach(crumbs, document.body);
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          let items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          let items = crumbs.node.querySelectorAll(ITEM_QUERY);
           const promise = signalToPromise(model.refreshed);
           expect(items[3].textContent).to.equal(third);
           simulate(items[3], 'click');
           await promise;
           MessageLoop.sendMessage(crumbs, Widget.Msg.UpdateRequest);
-          items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+          items = crumbs.node.querySelectorAll(ITEM_QUERY);
           expect(items.length).to.equal(4);
           expect(model.path).to.equal(path);
         });
@@ -198,14 +204,14 @@ describe('filebrowser/model', () => {
 
     describe('#onUpdateRequest()', () => {
       it('should be called when the model updates', async () => {
-        const model = new FileBrowserModel({ manager });
+        const model = new FileBrowserModel({ iconRegistry, manager });
         await model.cd(path);
         crumbs = new LogCrumbs({ model });
         await model.cd('..');
         await framePromise();
 
         expect(crumbs.methods).to.contain('onUpdateRequest');
-        const items = crumbs.node.getElementsByClassName(ITEM_CLASS);
+        const items = crumbs.node.querySelectorAll(ITEM_QUERY);
         expect(items.length).to.equal(3);
         model.dispose();
       });
diff --git a/tests/test-filebrowser/src/model.spec.ts b/tests/test-filebrowser/src/model.spec.ts
index b9886109012b..cd2542ba0c79 100644
--- a/tests/test-filebrowser/src/model.spec.ts
+++ b/tests/test-filebrowser/src/model.spec.ts
@@ -11,24 +11,27 @@ import { DocumentManager, IDocumentManager } from '@jupyterlab/docmanager';
 
 import { DocumentRegistry, TextModelFactory } from '@jupyterlab/docregistry';
 
-import {
-  Contents,
-  ContentsManager,
-  ServiceManager
-} from '@jupyterlab/services';
-
 import {
   FileBrowserModel,
   LARGE_FILE_SIZE,
   CHUNK_SIZE
 } from '@jupyterlab/filebrowser';
 
+import {
+  Contents,
+  ContentsManager,
+  ServiceManager
+} from '@jupyterlab/services';
+
 import {
   acceptDialog,
   dismissDialog,
   signalToPromises,
   sleep
 } from '@jupyterlab/testutils';
+
+import { defaultIconRegistry, IIconRegistry } from '@jupyterlab/ui-components';
+
 import { toArray } from '@phosphor/algorithm';
 
 /**
@@ -55,6 +58,7 @@ class DelayedContentsManager extends ContentsManager {
 }
 
 describe('filebrowser/model', () => {
+  let iconRegistry: IIconRegistry;
   let manager: IDocumentManager;
   let serviceManager: ServiceManager.IManager;
   let registry: DocumentRegistry;
@@ -73,6 +77,7 @@ describe('filebrowser/model', () => {
       textModelFactory: new TextModelFactory()
     });
     serviceManager = new ServiceManager({ standby: 'never' });
+    iconRegistry = defaultIconRegistry;
     manager = new DocumentManager({
       registry,
       opener,
@@ -83,7 +88,7 @@ describe('filebrowser/model', () => {
 
   beforeEach(async () => {
     await state.clear();
-    model = new FileBrowserModel({ manager, state });
+    model = new FileBrowserModel({ iconRegistry, manager, state });
     const contents = await manager.newUntitled({ type: 'file' });
     name = contents.name;
     return model.cd();
@@ -96,7 +101,7 @@ describe('filebrowser/model', () => {
   describe('FileBrowserModel', () => {
     describe('#constructor()', () => {
       it('should construct a new file browser model', () => {
-        model = new FileBrowserModel({ manager });
+        model = new FileBrowserModel({ iconRegistry, manager });
         expect(model).to.be.an.instanceof(FileBrowserModel);
       });
     });
@@ -260,7 +265,7 @@ describe('filebrowser/model', () => {
           opener,
           manager: delayedServiceManager
         });
-        model = new FileBrowserModel({ manager, state }); // Should delay 1000ms
+        model = new FileBrowserModel({ iconRegistry, manager, state }); // Should delay 1000ms
 
         // An initial refresh is called in the constructor.
         // If it is too slow, it can come in after the directory change,
@@ -280,7 +285,7 @@ describe('filebrowser/model', () => {
     describe('#restore()', () => {
       it('should restore based on ID', async () => {
         const id = 'foo';
-        const model2 = new FileBrowserModel({ manager, state });
+        const model2 = new FileBrowserModel({ iconRegistry, manager, state });
         await model.restore(id);
         await model.cd('src');
         expect(model.path).to.equal('src');
@@ -292,7 +297,7 @@ describe('filebrowser/model', () => {
 
       it('should be safe to call multiple times', async () => {
         const id = 'bar';
-        const model2 = new FileBrowserModel({ manager, state });
+        const model2 = new FileBrowserModel({ iconRegistry, manager, state });
         await model.restore(id);
         await model.cd('src');
         expect(model.path).to.equal('src');
diff --git a/tests/test-filebrowser/tsconfig.json b/tests/test-filebrowser/tsconfig.json
index bae9b844966a..fe415b7aed6a 100644
--- a/tests/test-filebrowser/tsconfig.json
+++ b/tests/test-filebrowser/tsconfig.json
@@ -25,6 +25,9 @@
     },
     {
       "path": "../../testutils"
+    },
+    {
+      "path": "../../packages/ui-components"
     }
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 252bdcf304e0..e1caed24660d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -641,7 +641,7 @@
     resize-observer-polyfill "^1.5.0"
     tslib "^1.9.0"
 
-"@blueprintjs/icons@^3.3.0", "@blueprintjs/icons@^3.8.0":
+"@blueprintjs/icons@^3.8.0":
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.9.0.tgz#173f70b0d6a573d2a97066c54b4d110ffadeee51"
   integrity sha512-kq1Bh6PtOF4PcuxcDme8NmnSlkfO0IV89FriZGo6zSA1+OOzSwzvoKqa6S7vJe8xCPPLO5r7lE9AjeOuGeH97g==
@@ -2018,6 +2018,11 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
+"@types/prettier@^1.16.4":
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.18.0.tgz#d2dbe4d5f76b455138f13a2d881278e2c06a733d"
+  integrity sha512-5N6WK/XXs9PLPpge2KOmOSaIym2vIo32GsrxM5YOFs7uZ8R9L/acg+hQzWsfwoHEpasqQkH0+3LzLTbiF1GFLQ==
+
 "@types/prop-types@*":
   version "15.7.1"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
@@ -7617,7 +7622,7 @@ karma-ie-launcher@^1.0.0:
   resolved "https://registry.yarnpkg.com/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz#497986842c490190346cd89f5494ca9830c6d59c"
   integrity sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=
   dependencies:
-    lodash "^4.6.2"
+    lodash "^4.6.1"
 
 karma-mocha-reporter@^2.2.5:
   version "2.2.5"
@@ -9723,7 +9728,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.17.0:
+prettier@^1.17.0, prettier@^1.18.2:
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
   integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
@@ -10689,7 +10694,7 @@ sanitize-html@~1.20.1:
     lodash.escaperegexp "^4.1.2"
     lodash.isplainobject "^4.0.6"
     lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.2"
+    lodash.mergewith "^4.6.1"
     postcss "^7.0.5"
     srcset "^1.0.0"
     xtend "^4.0.1"