From 2822e90904d30e37e55325d000c48f78509579cf Mon Sep 17 00:00:00 2001
From: Josh Black <josh@josh.black>
Date: Wed, 19 Jun 2019 23:21:48 -0500
Subject: [PATCH] chore(react): update to use new icon imports

---
 .../Accordion/Accordion.Skeleton.js           |   2 +-
 .../AccordionItem/AccordionItem-test.js       |   2 +-
 .../components/AccordionItem/AccordionItem.js |   2 +-
 .../src/components/Button/Button-story.js     |   3 +-
 .../src/components/Button/Button-test.js      |   2 +-
 .../src/components/CodeSnippet/CodeSnippet.js |   2 +-
 .../react/src/components/ComboBox/ComboBox.js |   2 +-
 .../components/ComposedModal/ComposedModal.js |   2 +-
 .../components/CopyButton/CopyButton-test.js  |   2 +-
 .../src/components/CopyButton/CopyButton.js   |   2 +-
 .../DangerButton/DangerButton-test.js         |   2 +-
 .../components/DataTable/TableBatchAction.js  |   2 +-
 .../components/DataTable/TableExpandHeader.js |   2 +-
 .../components/DataTable/TableExpandRow.js    |   2 +-
 .../src/components/DataTable/TableHeader.js   |   6 +-
 .../components/DataTable/TableToolbarMenu.js  |   2 +-
 .../__tests__/TableToolbarMenu-test.js        |   2 +-
 .../__snapshots__/DataTable-test.js.snap      | 545 +++++-------------
 .../TableBatchAction-test.js.snap             |  86 +--
 .../__snapshots__/TableExpandRow-test.js.snap |  42 +-
 .../TableToolbarMenu-test.js.snap             | 113 +---
 .../TableToolbarSearch-test.js.snap           |  84 +--
 .../DataTable/stories/with-batch-actions.js   |   8 +-
 .../DataTable/stories/with-dynamic-content.js |   8 +-
 .../DatePickerInput/DatePickerInput.js        |   2 +-
 .../react/src/components/Dropdown/Dropdown.js |   2 +-
 .../__snapshots__/Dropdown-test.js.snap       | 147 ++---
 .../FileUploader/FileUploader-test.js         |   2 +-
 .../components/FileUploader/FileUploader.js   |   3 +-
 .../react/src/components/ListBox/ListBox.js   |   2 +-
 .../src/components/ListBox/ListBoxMenuIcon.js |   2 +-
 .../components/ListBox/ListBoxSelection.js    |   2 +-
 .../__snapshots__/ListBoxField-test.js.snap   |  42 +-
 .../ListBoxMenuIcon-test.js.snap              |  98 ++--
 .../ListBoxSelection-test.js.snap             |  84 +--
 .../react/src/components/Modal/Modal-test.js  |   2 +-
 packages/react/src/components/Modal/Modal.js  |   2 +-
 .../ModalWrapper/ModalWrapper-story.js        |   3 +-
 .../__snapshots__/ModalWrapper-test.js.snap   |  43 +-
 .../MultiSelect/FilterableMultiSelect.js      |   2 +-
 .../src/components/MultiSelect/MultiSelect.js |   2 +-
 .../FilterableMultiSelect-test.js.snap        |  49 +-
 .../__snapshots__/MultiSelect-test.js.snap    |  49 +-
 .../Notification/Notification-test.js         |   4 +-
 .../components/Notification/Notification.js   |  10 +-
 .../NumberInput/NumberInput-test.js           |   3 +-
 .../src/components/NumberInput/NumberInput.js |   8 +-
 .../OverflowMenu/OverflowMenu-test.js         |   2 +-
 .../components/OverflowMenu/OverflowMenu.js   |   2 +-
 .../components/Pagination/Pagination-test.js  |   3 +-
 .../src/components/Pagination/Pagination.js   |   3 +-
 .../PrimaryButton/PrimaryButton-test.js       |   2 +-
 .../ProgressIndicator/ProgressIndicator.js    |   3 +-
 .../src/components/RadioTile/RadioTile.js     |   2 +-
 .../src/components/Search/Search-test.js      |   3 +-
 .../react/src/components/Search/Search.js     |   4 +-
 .../SearchFilterButton-test.js                |   2 +-
 .../SearchFilterButton/SearchFilterButton.js  |   2 +-
 .../SearchLayoutButton-test.js                |   3 +-
 .../SearchLayoutButton/SearchLayoutButton.js  |   3 +-
 .../SecondaryButton/SecondaryButton-test.js   |   2 +-
 .../src/components/Select/Select-test.js      |   2 +-
 .../react/src/components/Select/Select.js     |   3 +-
 .../StructuredList/StructuredList-story.js    |   2 +-
 .../react/src/components/Tabs/Tabs-test.js    |   2 +-
 packages/react/src/components/Tabs/Tabs.js    |   2 +-
 packages/react/src/components/Tag/Tag.js      |   2 +-
 .../react/src/components/TextArea/TextArea.js |   2 +-
 .../TextInput/ControlledPasswordInput.js      |   4 +-
 .../src/components/TextInput/PasswordInput.js |   4 +-
 .../src/components/TextInput/TextInput.js     |   2 +-
 .../react/src/components/Tile/Tile-test.js    |   2 +-
 packages/react/src/components/Tile/Tile.js    |   6 +-
 .../TimePickerSelect/TimePickerSelect.js      |   2 +-
 .../src/components/Toolbar/Toolbar-story.js   |   2 +-
 .../components/ToolbarSearch/ToolbarSearch.js |   2 +-
 .../src/components/Tooltip/Tooltip-story.js   |   2 +-
 .../src/components/Tooltip/Tooltip-test.js    |   8 +-
 .../react/src/components/Tooltip/Tooltip.js   |   2 +-
 .../TooltipIcon/TooltipIcon-story.js          |   2 +-
 .../src/components/UIShell/HeaderMenu.js      |   9 +-
 .../components/UIShell/HeaderMenuButton.js    |  10 +-
 .../src/components/UIShell/SideNavFooter.js   |  10 +-
 .../src/components/UIShell/SideNavMenu.js     |   9 +-
 .../src/components/UIShell/SideNavSwitcher.js |   9 +-
 .../src/components/UIShell/UIShell-story.js   |  11 +-
 .../__tests__/HeaderGlobalAction-test.js      |   9 +-
 .../__tests__/HeaderMenuButton-test.js        |   9 +-
 .../HeaderGlobalAction-test.js.snap           |  42 +-
 .../__snapshots__/HeaderMenu-test.js.snap     |  42 +-
 .../HeaderMenuButton-test.js.snap             |  42 +-
 .../__snapshots__/SideNav-test.js.snap        |  42 +-
 .../__snapshots__/SideNavFooter-test.js.snap  |  84 +--
 .../__snapshots__/SideNavMenu-test.js.snap    |  42 +-
 .../SideNavSwitcher-test.js.snap              |  42 +-
 95 files changed, 840 insertions(+), 1149 deletions(-)

diff --git a/packages/react/src/components/Accordion/Accordion.Skeleton.js b/packages/react/src/components/Accordion/Accordion.Skeleton.js
index e081f9d25088..664fe6ceec49 100644
--- a/packages/react/src/components/Accordion/Accordion.Skeleton.js
+++ b/packages/react/src/components/Accordion/Accordion.Skeleton.js
@@ -8,7 +8,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import SkeletonText from '../SkeletonText';
-import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
+import { ChevronRight16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/AccordionItem/AccordionItem-test.js b/packages/react/src/components/AccordionItem/AccordionItem-test.js
index 8c26699b3414..64d227b4c362 100644
--- a/packages/react/src/components/AccordionItem/AccordionItem-test.js
+++ b/packages/react/src/components/AccordionItem/AccordionItem-test.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import AccordionItem from '../AccordionItem';
-import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
+import { ChevronRight16 } from '@carbon/icons-react';
 import { shallow, mount } from 'enzyme';
 import { settings } from 'carbon-components';
 
diff --git a/packages/react/src/components/AccordionItem/AccordionItem.js b/packages/react/src/components/AccordionItem/AccordionItem.js
index e2f8602de041..a256c1001494 100644
--- a/packages/react/src/components/AccordionItem/AccordionItem.js
+++ b/packages/react/src/components/AccordionItem/AccordionItem.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { settings } from 'carbon-components';
-import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
+import { ChevronRight16 } from '@carbon/icons-react';
 import { match, keys } from '../../tools/key';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Button/Button-story.js b/packages/react/src/components/Button/Button-story.js
index a01ddd018ed4..719ab038a9c7 100644
--- a/packages/react/src/components/Button/Button-story.js
+++ b/packages/react/src/components/Button/Button-story.js
@@ -11,8 +11,7 @@ import { action } from '@storybook/addon-actions';
 import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
 import { settings } from 'carbon-components';
 import { iconAddSolid, iconSearch } from 'carbon-icons';
-import AddFilled16 from '@carbon/icons-react/lib/add--filled/16';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { AddFilled16, Search16 } from '@carbon/icons-react';
 import Button from '../Button';
 import ButtonSkeleton from '../Button/Button.Skeleton';
 
diff --git a/packages/react/src/components/Button/Button-test.js b/packages/react/src/components/Button/Button-test.js
index 73c99baee813..4a70fbfdf5db 100644
--- a/packages/react/src/components/Button/Button-test.js
+++ b/packages/react/src/components/Button/Button-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { Search16 } from '@carbon/icons-react';
 import Button from '../Button';
 import Link from '../Link';
 import ButtonSkeleton from '../Button/Button.Skeleton';
diff --git a/packages/react/src/components/CodeSnippet/CodeSnippet.js b/packages/react/src/components/CodeSnippet/CodeSnippet.js
index af6211d15676..34b5ef09bbf2 100644
--- a/packages/react/src/components/CodeSnippet/CodeSnippet.js
+++ b/packages/react/src/components/CodeSnippet/CodeSnippet.js
@@ -8,7 +8,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
-import ChevronDown16 from '@carbon/icons-react/lib/chevron--down/16';
+import { ChevronDown16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import Copy from '../Copy';
 import CopyButton from '../CopyButton';
diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js
index 277047aedaba..af655b420ca4 100644
--- a/packages/react/src/components/ComboBox/ComboBox.js
+++ b/packages/react/src/components/ComboBox/ComboBox.js
@@ -10,7 +10,7 @@ import Downshift from 'downshift';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 import ListBox, { PropTypes as ListBoxPropTypes } from '../ListBox';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/ComposedModal/ComposedModal.js b/packages/react/src/components/ComposedModal/ComposedModal.js
index efd9907d4bc0..cbb66341caad 100644
--- a/packages/react/src/components/ComposedModal/ComposedModal.js
+++ b/packages/react/src/components/ComposedModal/ComposedModal.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import Button from '../Button';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import Close20 from '@carbon/icons-react/lib/close/20';
+import { Close20 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/CopyButton/CopyButton-test.js b/packages/react/src/components/CopyButton/CopyButton-test.js
index 89cefe45c5bb..7a6879ec6532 100644
--- a/packages/react/src/components/CopyButton/CopyButton-test.js
+++ b/packages/react/src/components/CopyButton/CopyButton-test.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import CopyButton from '../CopyButton';
-import Copy16 from '@carbon/icons-react/lib/copy/16';
+import { Copy16 } from '@carbon/icons-react';
 import { shallow, mount } from 'enzyme';
 import { settings } from 'carbon-components';
 
diff --git a/packages/react/src/components/CopyButton/CopyButton.js b/packages/react/src/components/CopyButton/CopyButton.js
index 4fcafd39710b..61989e9a5515 100644
--- a/packages/react/src/components/CopyButton/CopyButton.js
+++ b/packages/react/src/components/CopyButton/CopyButton.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { settings } from 'carbon-components';
-import Copy16 from '@carbon/icons-react/lib/copy/16';
+import { Copy16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/DangerButton/DangerButton-test.js b/packages/react/src/components/DangerButton/DangerButton-test.js
index 995856356ba8..d39cf62f48f5 100644
--- a/packages/react/src/components/DangerButton/DangerButton-test.js
+++ b/packages/react/src/components/DangerButton/DangerButton-test.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import DangerButton from '../DangerButton';
 import { shallow, mount } from 'enzyme';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { Search16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/DataTable/TableBatchAction.js b/packages/react/src/components/DataTable/TableBatchAction.js
index 30eb618f4bab..347aee29c8cc 100644
--- a/packages/react/src/components/DataTable/TableBatchAction.js
+++ b/packages/react/src/components/DataTable/TableBatchAction.js
@@ -7,7 +7,7 @@
 
 import PropTypes from 'prop-types';
 import React from 'react';
-import iconAddSolid from '@carbon/icons-react/lib/add--filled/16';
+import { AddFilled16 as iconAddSolid } from '@carbon/icons-react';
 import Button from '../Button';
 
 const TableBatchAction = props => <Button {...props} />;
diff --git a/packages/react/src/components/DataTable/TableExpandHeader.js b/packages/react/src/components/DataTable/TableExpandHeader.js
index a46f9972dfb7..f28a8f8c969f 100644
--- a/packages/react/src/components/DataTable/TableExpandHeader.js
+++ b/packages/react/src/components/DataTable/TableExpandHeader.js
@@ -7,7 +7,7 @@
 
 import cx from 'classnames';
 import React from 'react';
-import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
+import { ChevronRight16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/DataTable/TableExpandRow.js b/packages/react/src/components/DataTable/TableExpandRow.js
index f83b279780ab..29c6b36d7797 100644
--- a/packages/react/src/components/DataTable/TableExpandRow.js
+++ b/packages/react/src/components/DataTable/TableExpandRow.js
@@ -8,7 +8,7 @@
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
-import ChevronRight16 from '@carbon/icons-react/lib/chevron--right/16';
+import { ChevronRight16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import TableCell from './TableCell';
 
diff --git a/packages/react/src/components/DataTable/TableHeader.js b/packages/react/src/components/DataTable/TableHeader.js
index 7feee188594f..31beb1070206 100644
--- a/packages/react/src/components/DataTable/TableHeader.js
+++ b/packages/react/src/components/DataTable/TableHeader.js
@@ -9,8 +9,10 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { settings } from 'carbon-components';
-import Arrow from '@carbon/icons-react/lib/arrow--up/20';
-import Arrows from '@carbon/icons-react/lib/arrows--vertical/20';
+import {
+  ArrowUp20 as Arrow,
+  ArrowsVertical20 as Arrows,
+} from '@carbon/icons-react';
 import { sortStates } from './state/sorting';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/DataTable/TableToolbarMenu.js b/packages/react/src/components/DataTable/TableToolbarMenu.js
index ec5597d68b25..b745f015392c 100644
--- a/packages/react/src/components/DataTable/TableToolbarMenu.js
+++ b/packages/react/src/components/DataTable/TableToolbarMenu.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { settings } from 'carbon-components';
 import OverflowMenu from '../OverflowMenu';
-import Settings16 from '@carbon/icons-react/lib/settings/16';
+import { Settings16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js b/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
index 714488afbd71..f03bac6b52b5 100644
--- a/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
+++ b/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import Download16 from '@carbon/icons-react/lib/download/16';
+import { Download16 } from '@carbon/icons-react';
 import { TableToolbarMenu } from '..';
 
 describe('DataTable.TableToolbarMenu', () => {
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
index a9356106e052..0cc322d44898 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -1769,27 +1769,6 @@ exports[`DataTable should render 1`] = `
                   renderIcon={
                     Object {
                       "$$typeof": Symbol(react.forward_ref),
-                      "defaultProps": Object {
-                        "height": 16,
-                        "preserveAspectRatio": "xMidYMid meet",
-                        "viewBox": "0 0 16 16",
-                        "width": 16,
-                        "xmlns": "http://www.w3.org/2000/svg",
-                      },
-                      "displayName": "AddFilled16",
-                      "propTypes": Object {
-                        "aria-hidden": [Function],
-                        "aria-label": [Function],
-                        "aria-labelledby": [Function],
-                        "children": [Function],
-                        "className": [Function],
-                        "height": [Function],
-                        "preserveAspectRatio": [Function],
-                        "tabIndex": [Function],
-                        "viewBox": [Function],
-                        "width": [Function],
-                        "xmlns": [Function],
-                      },
                       "render": [Function],
                     }
                   }
@@ -1802,27 +1781,6 @@ exports[`DataTable should render 1`] = `
                   renderIcon={
                     Object {
                       "$$typeof": Symbol(react.forward_ref),
-                      "defaultProps": Object {
-                        "height": 16,
-                        "preserveAspectRatio": "xMidYMid meet",
-                        "viewBox": "0 0 16 16",
-                        "width": 16,
-                        "xmlns": "http://www.w3.org/2000/svg",
-                      },
-                      "displayName": "AddFilled16",
-                      "propTypes": Object {
-                        "aria-hidden": [Function],
-                        "aria-label": [Function],
-                        "aria-labelledby": [Function],
-                        "children": [Function],
-                        "className": [Function],
-                        "height": [Function],
-                        "preserveAspectRatio": [Function],
-                        "tabIndex": [Function],
-                        "viewBox": [Function],
-                        "width": [Function],
-                        "xmlns": [Function],
-                      },
                       "render": [Function],
                     }
                   }
@@ -1835,27 +1793,6 @@ exports[`DataTable should render 1`] = `
                   renderIcon={
                     Object {
                       "$$typeof": Symbol(react.forward_ref),
-                      "defaultProps": Object {
-                        "height": 16,
-                        "preserveAspectRatio": "xMidYMid meet",
-                        "viewBox": "0 0 16 16",
-                        "width": 16,
-                        "xmlns": "http://www.w3.org/2000/svg",
-                      },
-                      "displayName": "AddFilled16",
-                      "propTypes": Object {
-                        "aria-hidden": [Function],
-                        "aria-label": [Function],
-                        "aria-labelledby": [Function],
-                        "children": [Function],
-                        "className": [Function],
-                        "height": [Function],
-                        "preserveAspectRatio": [Function],
-                        "tabIndex": [Function],
-                        "viewBox": [Function],
-                        "width": [Function],
-                        "xmlns": [Function],
-                      },
                       "render": [Function],
                     }
                   }
@@ -1875,27 +1812,6 @@ exports[`DataTable should render 1`] = `
                   renderIcon={
                     Object {
                       "$$typeof": Symbol(react.forward_ref),
-                      "defaultProps": Object {
-                        "height": 16,
-                        "preserveAspectRatio": "xMidYMid meet",
-                        "viewBox": "0 0 16 16",
-                        "width": 16,
-                        "xmlns": "http://www.w3.org/2000/svg",
-                      },
-                      "displayName": "Settings16",
-                      "propTypes": Object {
-                        "aria-hidden": [Function],
-                        "aria-label": [Function],
-                        "aria-labelledby": [Function],
-                        "children": [Function],
-                        "className": [Function],
-                        "height": [Function],
-                        "preserveAspectRatio": [Function],
-                        "tabIndex": [Function],
-                        "viewBox": [Function],
-                        "width": [Function],
-                        "xmlns": [Function],
-                      },
                       "render": [Function],
                     }
                   }
@@ -2053,27 +1969,6 @@ exports[`DataTable should render 1`] = `
                     renderIcon={
                       Object {
                         "$$typeof": Symbol(react.forward_ref),
-                        "defaultProps": Object {
-                          "height": 16,
-                          "preserveAspectRatio": "xMidYMid meet",
-                          "viewBox": "0 0 16 16",
-                          "width": 16,
-                          "xmlns": "http://www.w3.org/2000/svg",
-                        },
-                        "displayName": "AddFilled16",
-                        "propTypes": Object {
-                          "aria-hidden": [Function],
-                          "aria-label": [Function],
-                          "aria-labelledby": [Function],
-                          "children": [Function],
-                          "className": [Function],
-                          "height": [Function],
-                          "preserveAspectRatio": [Function],
-                          "tabIndex": [Function],
-                          "viewBox": [Function],
-                          "width": [Function],
-                          "xmlns": [Function],
-                        },
                         "render": [Function],
                       }
                     }
@@ -2086,27 +1981,6 @@ exports[`DataTable should render 1`] = `
                       renderIcon={
                         Object {
                           "$$typeof": Symbol(react.forward_ref),
-                          "defaultProps": Object {
-                            "height": 16,
-                            "preserveAspectRatio": "xMidYMid meet",
-                            "viewBox": "0 0 16 16",
-                            "width": 16,
-                            "xmlns": "http://www.w3.org/2000/svg",
-                          },
-                          "displayName": "AddFilled16",
-                          "propTypes": Object {
-                            "aria-hidden": [Function],
-                            "aria-label": [Function],
-                            "aria-labelledby": [Function],
-                            "children": [Function],
-                            "className": [Function],
-                            "height": [Function],
-                            "preserveAspectRatio": [Function],
-                            "tabIndex": [Function],
-                            "viewBox": [Function],
-                            "width": [Function],
-                            "xmlns": [Function],
-                          },
                           "render": [Function],
                         }
                       }
@@ -2122,38 +1996,44 @@ exports[`DataTable should render 1`] = `
                         type="button"
                       >
                         Ghost
-                        <AddFilled16
+                        <ForwardRef(AddFilled16)
                           aria-hidden={true}
                           aria-label="Add"
                           className="bx--btn__icon"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <svg
+                          <Icon
                             aria-hidden={true}
                             aria-label="Add"
                             className="bx--btn__icon"
-                            focusable="false"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
-                            style={
-                              Object {
-                                "willChange": "transform",
-                              }
-                            }
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
-                            />
-                          </svg>
-                        </AddFilled16>
+                            <svg
+                              aria-hidden={true}
+                              aria-label="Add"
+                              className="bx--btn__icon"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              style={
+                                Object {
+                                  "willChange": "transform",
+                                }
+                              }
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
+                              />
+                            </svg>
+                          </Icon>
+                        </ForwardRef(AddFilled16)>
                       </button>
                     </ForwardRef(Button)>
                   </TableBatchAction>
@@ -2163,27 +2043,6 @@ exports[`DataTable should render 1`] = `
                     renderIcon={
                       Object {
                         "$$typeof": Symbol(react.forward_ref),
-                        "defaultProps": Object {
-                          "height": 16,
-                          "preserveAspectRatio": "xMidYMid meet",
-                          "viewBox": "0 0 16 16",
-                          "width": 16,
-                          "xmlns": "http://www.w3.org/2000/svg",
-                        },
-                        "displayName": "AddFilled16",
-                        "propTypes": Object {
-                          "aria-hidden": [Function],
-                          "aria-label": [Function],
-                          "aria-labelledby": [Function],
-                          "children": [Function],
-                          "className": [Function],
-                          "height": [Function],
-                          "preserveAspectRatio": [Function],
-                          "tabIndex": [Function],
-                          "viewBox": [Function],
-                          "width": [Function],
-                          "xmlns": [Function],
-                        },
                         "render": [Function],
                       }
                     }
@@ -2196,27 +2055,6 @@ exports[`DataTable should render 1`] = `
                       renderIcon={
                         Object {
                           "$$typeof": Symbol(react.forward_ref),
-                          "defaultProps": Object {
-                            "height": 16,
-                            "preserveAspectRatio": "xMidYMid meet",
-                            "viewBox": "0 0 16 16",
-                            "width": 16,
-                            "xmlns": "http://www.w3.org/2000/svg",
-                          },
-                          "displayName": "AddFilled16",
-                          "propTypes": Object {
-                            "aria-hidden": [Function],
-                            "aria-label": [Function],
-                            "aria-labelledby": [Function],
-                            "children": [Function],
-                            "className": [Function],
-                            "height": [Function],
-                            "preserveAspectRatio": [Function],
-                            "tabIndex": [Function],
-                            "viewBox": [Function],
-                            "width": [Function],
-                            "xmlns": [Function],
-                          },
                           "render": [Function],
                         }
                       }
@@ -2232,38 +2070,44 @@ exports[`DataTable should render 1`] = `
                         type="button"
                       >
                         Ghost
-                        <AddFilled16
+                        <ForwardRef(AddFilled16)
                           aria-hidden={true}
                           aria-label="Add"
                           className="bx--btn__icon"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <svg
+                          <Icon
                             aria-hidden={true}
                             aria-label="Add"
                             className="bx--btn__icon"
-                            focusable="false"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
-                            style={
-                              Object {
-                                "willChange": "transform",
-                              }
-                            }
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
-                            />
-                          </svg>
-                        </AddFilled16>
+                            <svg
+                              aria-hidden={true}
+                              aria-label="Add"
+                              className="bx--btn__icon"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              style={
+                                Object {
+                                  "willChange": "transform",
+                                }
+                              }
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
+                              />
+                            </svg>
+                          </Icon>
+                        </ForwardRef(AddFilled16)>
                       </button>
                     </ForwardRef(Button)>
                   </TableBatchAction>
@@ -2273,27 +2117,6 @@ exports[`DataTable should render 1`] = `
                     renderIcon={
                       Object {
                         "$$typeof": Symbol(react.forward_ref),
-                        "defaultProps": Object {
-                          "height": 16,
-                          "preserveAspectRatio": "xMidYMid meet",
-                          "viewBox": "0 0 16 16",
-                          "width": 16,
-                          "xmlns": "http://www.w3.org/2000/svg",
-                        },
-                        "displayName": "AddFilled16",
-                        "propTypes": Object {
-                          "aria-hidden": [Function],
-                          "aria-label": [Function],
-                          "aria-labelledby": [Function],
-                          "children": [Function],
-                          "className": [Function],
-                          "height": [Function],
-                          "preserveAspectRatio": [Function],
-                          "tabIndex": [Function],
-                          "viewBox": [Function],
-                          "width": [Function],
-                          "xmlns": [Function],
-                        },
                         "render": [Function],
                       }
                     }
@@ -2306,27 +2129,6 @@ exports[`DataTable should render 1`] = `
                       renderIcon={
                         Object {
                           "$$typeof": Symbol(react.forward_ref),
-                          "defaultProps": Object {
-                            "height": 16,
-                            "preserveAspectRatio": "xMidYMid meet",
-                            "viewBox": "0 0 16 16",
-                            "width": 16,
-                            "xmlns": "http://www.w3.org/2000/svg",
-                          },
-                          "displayName": "AddFilled16",
-                          "propTypes": Object {
-                            "aria-hidden": [Function],
-                            "aria-label": [Function],
-                            "aria-labelledby": [Function],
-                            "children": [Function],
-                            "className": [Function],
-                            "height": [Function],
-                            "preserveAspectRatio": [Function],
-                            "tabIndex": [Function],
-                            "viewBox": [Function],
-                            "width": [Function],
-                            "xmlns": [Function],
-                          },
                           "render": [Function],
                         }
                       }
@@ -2342,38 +2144,44 @@ exports[`DataTable should render 1`] = `
                         type="button"
                       >
                         Ghost
-                        <AddFilled16
+                        <ForwardRef(AddFilled16)
                           aria-hidden={true}
                           aria-label="Add"
                           className="bx--btn__icon"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <svg
+                          <Icon
                             aria-hidden={true}
                             aria-label="Add"
                             className="bx--btn__icon"
-                            focusable="false"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
-                            style={
-                              Object {
-                                "willChange": "transform",
-                              }
-                            }
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
-                            />
-                          </svg>
-                        </AddFilled16>
+                            <svg
+                              aria-hidden={true}
+                              aria-label="Add"
+                              className="bx--btn__icon"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              style={
+                                Object {
+                                  "willChange": "transform",
+                                }
+                              }
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
+                              />
+                            </svg>
+                          </Icon>
+                        </ForwardRef(AddFilled16)>
                       </button>
                     </ForwardRef(Button)>
                   </TableBatchAction>
@@ -2445,37 +2253,43 @@ exports[`DataTable should render 1`] = `
                       className="bx--search bx--search--sm bx--search-maginfier"
                       role="search"
                     >
-                      <Search16
+                      <ForwardRef(Search16)
                         aria-label="Filter table"
                         className="bx--search-magnifier"
-                        height={16}
-                        preserveAspectRatio="xMidYMid meet"
                         role="img"
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <svg
+                        <Icon
                           aria-label="Filter table"
                           className="bx--search-magnifier"
-                          focusable="false"
                           height={16}
                           preserveAspectRatio="xMidYMid meet"
                           role="img"
-                          style={
-                            Object {
-                              "willChange": "transform",
-                            }
-                          }
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M15 14.3L10.7 10c1.9-2.3 1.6-5.8-.7-7.7S4.2.7 2.3 3 .7 8.8 3 10.7c2 1.7 5 1.7 7 0l4.3 4.3.7-.7zM2 6.5C2 4 4 2 6.5 2S11 4 11 6.5 9 11 6.5 11 2 9 2 6.5z"
-                          />
-                        </svg>
-                      </Search16>
+                          <svg
+                            aria-label="Filter table"
+                            className="bx--search-magnifier"
+                            focusable="false"
+                            height={16}
+                            preserveAspectRatio="xMidYMid meet"
+                            role="img"
+                            style={
+                              Object {
+                                "willChange": "transform",
+                              }
+                            }
+                            viewBox="0 0 16 16"
+                            width={16}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M15 14.3L10.7 10c1.9-2.3 1.6-5.8-.7-7.7S4.2.7 2.3 3 .7 8.8 3 10.7c2 1.7 5 1.7 7 0l4.3 4.3.7-.7zM2 6.5C2 4 4 2 6.5 2S11 4 11 6.5 9 11 6.5 11 2 9 2 6.5z"
+                            />
+                          </svg>
+                        </Icon>
+                      </ForwardRef(Search16)>
                       <label
                         className="bx--label"
                         htmlFor="custom-id"
@@ -2497,34 +2311,38 @@ exports[`DataTable should render 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <Close16
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
+                        <ForwardRef(Close16)
                           role="img"
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <svg
-                            aria-hidden={true}
-                            focusable="false"
+                          <Icon
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
                             role="img"
-                            style={
-                              Object {
-                                "willChange": "transform",
-                              }
-                            }
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
-                            />
-                          </svg>
-                        </Close16>
+                            <svg
+                              aria-hidden={true}
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              style={
+                                Object {
+                                  "willChange": "transform",
+                                }
+                              }
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
+                              />
+                            </svg>
+                          </Icon>
+                        </ForwardRef(Close16)>
                       </button>
                     </div>
                   </Search>
@@ -2535,27 +2353,6 @@ exports[`DataTable should render 1`] = `
                 renderIcon={
                   Object {
                     "$$typeof": Symbol(react.forward_ref),
-                    "defaultProps": Object {
-                      "height": 16,
-                      "preserveAspectRatio": "xMidYMid meet",
-                      "viewBox": "0 0 16 16",
-                      "width": 16,
-                      "xmlns": "http://www.w3.org/2000/svg",
-                    },
-                    "displayName": "Settings16",
-                    "propTypes": Object {
-                      "aria-hidden": [Function],
-                      "aria-label": [Function],
-                      "aria-labelledby": [Function],
-                      "children": [Function],
-                      "className": [Function],
-                      "height": [Function],
-                      "preserveAspectRatio": [Function],
-                      "tabIndex": [Function],
-                      "viewBox": [Function],
-                      "width": [Function],
-                      "xmlns": [Function],
-                    },
                     "render": [Function],
                   }
                 }
@@ -2566,27 +2363,6 @@ exports[`DataTable should render 1`] = `
                   renderIcon={
                     Object {
                       "$$typeof": Symbol(react.forward_ref),
-                      "defaultProps": Object {
-                        "height": 16,
-                        "preserveAspectRatio": "xMidYMid meet",
-                        "viewBox": "0 0 16 16",
-                        "width": 16,
-                        "xmlns": "http://www.w3.org/2000/svg",
-                      },
-                      "displayName": "Settings16",
-                      "propTypes": Object {
-                        "aria-hidden": [Function],
-                        "aria-label": [Function],
-                        "aria-labelledby": [Function],
-                        "children": [Function],
-                        "className": [Function],
-                        "height": [Function],
-                        "preserveAspectRatio": [Function],
-                        "tabIndex": [Function],
-                        "viewBox": [Function],
-                        "width": [Function],
-                        "xmlns": [Function],
-                      },
                       "render": [Function],
                     }
                   }
@@ -2609,27 +2385,6 @@ exports[`DataTable should render 1`] = `
                     renderIcon={
                       Object {
                         "$$typeof": Symbol(react.forward_ref),
-                        "defaultProps": Object {
-                          "height": 16,
-                          "preserveAspectRatio": "xMidYMid meet",
-                          "viewBox": "0 0 16 16",
-                          "width": 16,
-                          "xmlns": "http://www.w3.org/2000/svg",
-                        },
-                        "displayName": "Settings16",
-                        "propTypes": Object {
-                          "aria-hidden": [Function],
-                          "aria-label": [Function],
-                          "aria-labelledby": [Function],
-                          "children": [Function],
-                          "className": [Function],
-                          "height": [Function],
-                          "preserveAspectRatio": [Function],
-                          "tabIndex": [Function],
-                          "viewBox": [Function],
-                          "width": [Function],
-                          "xmlns": [Function],
-                        },
                         "render": [Function],
                       }
                     }
@@ -2652,19 +2407,14 @@ exports[`DataTable should render 1`] = `
                         tabIndex={0}
                         title="Settings"
                       >
-                        <Settings16
+                        <ForwardRef(Settings16)
                           aria-label="open and close list of options"
                           className="bx--overflow-menu__icon"
                           focusable="false"
-                          height={16}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <svg
+                          <Icon
                             aria-label="open and close list of options"
                             className="bx--overflow-menu__icon"
                             focusable="false"
@@ -2672,27 +2422,40 @@ exports[`DataTable should render 1`] = `
                             onClick={[Function]}
                             onKeyDown={[Function]}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
-                            style={
-                              Object {
-                                "willChange": "transform",
-                              }
-                            }
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <title>
-                              open and close list of options
-                            </title>
-                            <path
-                              d="M13.5 8.4v-.8l1-.8c.4-.3.4-.9.2-1.3l-1.2-2c-.2-.3-.5-.5-.9-.5-.1 0-.2 0-.3.1l-1.2.4c-.2-.1-.4-.3-.7-.4l-.3-1.3c0-.5-.4-.8-.9-.8H6.8c-.5 0-.9.3-1 .8l-.2 1.3c-.3.1-.5.2-.7.3L3.7 3h-.3c-.4 0-.7.2-.9.5l-1.2 2c-.2.4-.1.9.3 1.3l.9.9v.8l-.9.7c-.4.3-.5.9-.2 1.3l1.2 2c.1.3.4.5.8.5.1 0 .2 0 .3-.1l1.2-.4c.2.1.4.3.7.4l.3 1.3c.1.5.5.8 1 .8h2.4c.5 0 .9-.3 1-.8l.3-1.3c.2-.1.4-.2.7-.4l1.2.4c.1 0 .2.1.3.1.4 0 .7-.2.9-.5l1.1-2c.2-.4.2-.9-.2-1.3l-1.1-.8zm-.9 3.6l-1.7-.6c-.4.3-.9.6-1.4.8L9.2 14H6.8l-.4-1.8c-.5-.2-.9-.5-1.4-.8l-1.6.6-1.2-2 1.4-1.2c-.1-.5-.1-1.1 0-1.6L2.2 6l1.2-2 1.7.6c.4-.4.9-.6 1.4-.8L6.8 2h2.4l.4 1.8c.5.2.9.5 1.4.8l1.6-.6 1.2 2-1.4 1.2c.1.5.1 1.1 0 1.6l1.4 1.2-1.2 2z"
-                            />
-                            <path
-                              d="M8 11c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3c0 1.6-1.3 3-3 3zm0-5c-1.1 0-2 .8-2 1.9V8c0 1.1.8 2 1.9 2H8c1.1 0 2-.8 2-1.9V8c0-1.1-.8-2-2-2 .1 0 0 0 0 0z"
-                            />
-                          </svg>
-                        </Settings16>
+                            <svg
+                              aria-label="open and close list of options"
+                              className="bx--overflow-menu__icon"
+                              focusable="false"
+                              height={16}
+                              onClick={[Function]}
+                              onKeyDown={[Function]}
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              style={
+                                Object {
+                                  "willChange": "transform",
+                                }
+                              }
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M13.5 8.4v-.8l1-.8c.4-.3.4-.9.2-1.3l-1.2-2c-.2-.3-.5-.5-.9-.5-.1 0-.2 0-.3.1l-1.2.4c-.2-.1-.4-.3-.7-.4l-.3-1.3c0-.5-.4-.8-.9-.8H6.8c-.5 0-.9.3-1 .8l-.2 1.3c-.3.1-.5.2-.7.3L3.7 3h-.3c-.4 0-.7.2-.9.5l-1.2 2c-.2.4-.1.9.3 1.3l.9.9v.8l-.9.7c-.4.3-.5.9-.2 1.3l1.2 2c.1.3.4.5.8.5.1 0 .2 0 .3-.1l1.2-.4c.2.1.4.3.7.4l.3 1.3c.1.5.5.8 1 .8h2.4c.5 0 .9-.3 1-.8l.3-1.3c.2-.1.4-.2.7-.4l1.2.4c.1 0 .2.1.3.1.4 0 .7-.2.9-.5l1.1-2c.2-.4.2-.9-.2-1.3l-1.1-.8zm-.9 3.6l-1.7-.6c-.4.3-.9.6-1.4.8L9.2 14H6.8l-.4-1.8c-.5-.2-.9-.5-1.4-.8l-1.6.6-1.2-2 1.4-1.2c-.1-.5-.1-1.1 0-1.6L2.2 6l1.2-2 1.7.6c.4-.4.9-.6 1.4-.8L6.8 2h2.4l.4 1.8c.5.2.9.5 1.4.8l1.6-.6 1.2 2-1.4 1.2c.1.5.1 1.1 0 1.6l1.4 1.2-1.2 2z"
+                              />
+                              <path
+                                d="M8 11c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3c0 1.6-1.3 3-3 3zm0-5c-1.1 0-2 .8-2 1.9V8c0 1.1.8 2 1.9 2H8c1.1 0 2-.8 2-1.9V8c0-1.1-.8-2-2-2 .1 0 0 0 0 0z"
+                              />
+                              <title>
+                                open and close list of options
+                              </title>
+                            </svg>
+                          </Icon>
+                        </ForwardRef(Settings16)>
                       </div>
                     </ClickListener>
                   </OverflowMenu>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
index 5d02f5d41686..9e829a8af3d3 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
@@ -7,27 +7,6 @@ exports[`DataTable.TableBatchAction should render 1`] = `
   renderIcon={
     Object {
       "$$typeof": Symbol(react.forward_ref),
-      "defaultProps": Object {
-        "height": 16,
-        "preserveAspectRatio": "xMidYMid meet",
-        "viewBox": "0 0 16 16",
-        "width": 16,
-        "xmlns": "http://www.w3.org/2000/svg",
-      },
-      "displayName": "AddFilled16",
-      "propTypes": Object {
-        "aria-hidden": [Function],
-        "aria-label": [Function],
-        "aria-labelledby": [Function],
-        "children": [Function],
-        "className": [Function],
-        "height": [Function],
-        "preserveAspectRatio": [Function],
-        "tabIndex": [Function],
-        "viewBox": [Function],
-        "width": [Function],
-        "xmlns": [Function],
-      },
       "render": [Function],
     }
   }
@@ -40,27 +19,6 @@ exports[`DataTable.TableBatchAction should render 1`] = `
     renderIcon={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "defaultProps": Object {
-          "height": 16,
-          "preserveAspectRatio": "xMidYMid meet",
-          "viewBox": "0 0 16 16",
-          "width": 16,
-          "xmlns": "http://www.w3.org/2000/svg",
-        },
-        "displayName": "AddFilled16",
-        "propTypes": Object {
-          "aria-hidden": [Function],
-          "aria-label": [Function],
-          "aria-labelledby": [Function],
-          "children": [Function],
-          "className": [Function],
-          "height": [Function],
-          "preserveAspectRatio": [Function],
-          "tabIndex": [Function],
-          "viewBox": [Function],
-          "width": [Function],
-          "xmlns": [Function],
-        },
         "render": [Function],
       }
     }
@@ -74,38 +32,44 @@ exports[`DataTable.TableBatchAction should render 1`] = `
       tabIndex={0}
       type="button"
     >
-      <AddFilled16
+      <ForwardRef(AddFilled16)
         aria-hidden={true}
         aria-label="Add"
         className="bx--btn__icon"
-        height={16}
-        preserveAspectRatio="xMidYMid meet"
-        viewBox="0 0 16 16"
-        width={16}
-        xmlns="http://www.w3.org/2000/svg"
       >
-        <svg
+        <Icon
           aria-hidden={true}
           aria-label="Add"
           className="bx--btn__icon"
-          focusable="false"
           height={16}
           preserveAspectRatio="xMidYMid meet"
-          role="img"
-          style={
-            Object {
-              "willChange": "transform",
-            }
-          }
           viewBox="0 0 16 16"
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
-          />
-        </svg>
-      </AddFilled16>
+          <svg
+            aria-hidden={true}
+            aria-label="Add"
+            className="bx--btn__icon"
+            focusable="false"
+            height={16}
+            preserveAspectRatio="xMidYMid meet"
+            role="img"
+            style={
+              Object {
+                "willChange": "transform",
+              }
+            }
+            viewBox="0 0 16 16"
+            width={16}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M8 1C4.2 1 1 4.2 1 8s3.2 7 7 7 7-3.2 7-7-3.2-7-7-7zm3 7.5H8.5V11h-1V8.5H5v-1h2.5V5h1v2.5H11v1z"
+            />
+          </svg>
+        </Icon>
+      </ForwardRef(AddFilled16)>
     </button>
   </ForwardRef(Button)>
 </TableBatchAction>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
index ccfb5c082487..50a1d09d579d 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
@@ -37,34 +37,38 @@ exports[`DataTable.TableExpandRow should render 1`] = `
                   className="bx--table-expand__button"
                   onClick={[MockFunction]}
                 >
-                  <ChevronRight16
+                  <ForwardRef(ChevronRight16)
                     className="bx--table-expand__svg"
-                    height={16}
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
                   >
-                    <svg
-                      aria-hidden={true}
+                    <Icon
                       className="bx--table-expand__svg"
-                      focusable="false"
                       height={16}
                       preserveAspectRatio="xMidYMid meet"
-                      style={
-                        Object {
-                          "willChange": "transform",
-                        }
-                      }
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <path
-                        d="M11 8l-5 5-.7-.7L9.6 8 5.3 3.7 6 3z"
-                      />
-                    </svg>
-                  </ChevronRight16>
+                      <svg
+                        aria-hidden={true}
+                        className="bx--table-expand__svg"
+                        focusable="false"
+                        height={16}
+                        preserveAspectRatio="xMidYMid meet"
+                        style={
+                          Object {
+                            "willChange": "transform",
+                          }
+                        }
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M11 8l-5 5-.7-.7L9.6 8 5.3 3.7 6 3z"
+                        />
+                      </svg>
+                    </Icon>
+                  </ForwardRef(ChevronRight16)>
                 </button>
               </td>
             </TableCell>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
index 126a77928276..36eb4cd207b4 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
@@ -7,27 +7,6 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
   renderIcon={
     Object {
       "$$typeof": Symbol(react.forward_ref),
-      "defaultProps": Object {
-        "height": 16,
-        "preserveAspectRatio": "xMidYMid meet",
-        "viewBox": "0 0 16 16",
-        "width": 16,
-        "xmlns": "http://www.w3.org/2000/svg",
-      },
-      "displayName": "Download16",
-      "propTypes": Object {
-        "aria-hidden": [Function],
-        "aria-label": [Function],
-        "aria-labelledby": [Function],
-        "children": [Function],
-        "className": [Function],
-        "height": [Function],
-        "preserveAspectRatio": [Function],
-        "tabIndex": [Function],
-        "viewBox": [Function],
-        "width": [Function],
-        "xmlns": [Function],
-      },
       "render": [Function],
     }
   }
@@ -38,27 +17,6 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
     renderIcon={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "defaultProps": Object {
-          "height": 16,
-          "preserveAspectRatio": "xMidYMid meet",
-          "viewBox": "0 0 16 16",
-          "width": 16,
-          "xmlns": "http://www.w3.org/2000/svg",
-        },
-        "displayName": "Download16",
-        "propTypes": Object {
-          "aria-hidden": [Function],
-          "aria-label": [Function],
-          "aria-labelledby": [Function],
-          "children": [Function],
-          "className": [Function],
-          "height": [Function],
-          "preserveAspectRatio": [Function],
-          "tabIndex": [Function],
-          "viewBox": [Function],
-          "width": [Function],
-          "xmlns": [Function],
-        },
         "render": [Function],
       }
     }
@@ -81,27 +39,6 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
       renderIcon={
         Object {
           "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "height": 16,
-            "preserveAspectRatio": "xMidYMid meet",
-            "viewBox": "0 0 16 16",
-            "width": 16,
-            "xmlns": "http://www.w3.org/2000/svg",
-          },
-          "displayName": "Download16",
-          "propTypes": Object {
-            "aria-hidden": [Function],
-            "aria-label": [Function],
-            "aria-labelledby": [Function],
-            "children": [Function],
-            "className": [Function],
-            "height": [Function],
-            "preserveAspectRatio": [Function],
-            "tabIndex": [Function],
-            "viewBox": [Function],
-            "width": [Function],
-            "xmlns": [Function],
-          },
           "render": [Function],
         }
       }
@@ -124,19 +61,14 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
           tabIndex={0}
           title="Add"
         >
-          <Download16
+          <ForwardRef(Download16)
             aria-label="open and close list of options"
             className="bx--overflow-menu__icon"
             focusable="false"
-            height={16}
             onClick={[Function]}
             onKeyDown={[Function]}
-            preserveAspectRatio="xMidYMid meet"
-            viewBox="0 0 16 16"
-            width={16}
-            xmlns="http://www.w3.org/2000/svg"
           >
-            <svg
+            <Icon
               aria-label="open and close list of options"
               className="bx--overflow-menu__icon"
               focusable="false"
@@ -144,24 +76,37 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
               onClick={[Function]}
               onKeyDown={[Function]}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
-              style={
-                Object {
-                  "willChange": "transform",
-                }
-              }
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <title>
-                open and close list of options
-              </title>
-              <path
-                d="M13 7l-.7-.7-3.8 3.8V1h-1v9.1L3.7 6.3 3 7l5 5zm0 5v2H3v-2H2v2c0 .6.4 1 1 1h10c.6 0 1-.4 1-1v-2h-1z"
-              />
-            </svg>
-          </Download16>
+              <svg
+                aria-label="open and close list of options"
+                className="bx--overflow-menu__icon"
+                focusable="false"
+                height={16}
+                onClick={[Function]}
+                onKeyDown={[Function]}
+                preserveAspectRatio="xMidYMid meet"
+                role="img"
+                style={
+                  Object {
+                    "willChange": "transform",
+                  }
+                }
+                viewBox="0 0 16 16"
+                width={16}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M13 7l-.7-.7-3.8 3.8V1h-1v9.1L3.7 6.3 3 7l5 5zm0 5v2H3v-2H2v2c0 .6.4 1 1 1h10c.6 0 1-.4 1-1v-2h-1z"
+                />
+                <title>
+                  open and close list of options
+                </title>
+              </svg>
+            </Icon>
+          </ForwardRef(Download16)>
         </div>
       </ClickListener>
     </OverflowMenu>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
index cff45019c6e5..0bede21d6b68 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
@@ -32,37 +32,43 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
         className="bx--search bx--search--sm className bx--search-maginfier"
         role="search"
       >
-        <Search16
+        <ForwardRef(Search16)
           aria-label="Filter table"
           className="bx--search-magnifier"
-          height={16}
-          preserveAspectRatio="xMidYMid meet"
           role="img"
-          viewBox="0 0 16 16"
-          width={16}
-          xmlns="http://www.w3.org/2000/svg"
         >
-          <svg
+          <Icon
             aria-label="Filter table"
             className="bx--search-magnifier"
-            focusable="false"
             height={16}
             preserveAspectRatio="xMidYMid meet"
             role="img"
-            style={
-              Object {
-                "willChange": "transform",
-              }
-            }
             viewBox="0 0 16 16"
             width={16}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M15 14.3L10.7 10c1.9-2.3 1.6-5.8-.7-7.7S4.2.7 2.3 3 .7 8.8 3 10.7c2 1.7 5 1.7 7 0l4.3 4.3.7-.7zM2 6.5C2 4 4 2 6.5 2S11 4 11 6.5 9 11 6.5 11 2 9 2 6.5z"
-            />
-          </svg>
-        </Search16>
+            <svg
+              aria-label="Filter table"
+              className="bx--search-magnifier"
+              focusable="false"
+              height={16}
+              preserveAspectRatio="xMidYMid meet"
+              role="img"
+              style={
+                Object {
+                  "willChange": "transform",
+                }
+              }
+              viewBox="0 0 16 16"
+              width={16}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M15 14.3L10.7 10c1.9-2.3 1.6-5.8-.7-7.7S4.2.7 2.3 3 .7 8.8 3 10.7c2 1.7 5 1.7 7 0l4.3 4.3.7-.7zM2 6.5C2 4 4 2 6.5 2S11 4 11 6.5 9 11 6.5 11 2 9 2 6.5z"
+              />
+            </svg>
+          </Icon>
+        </ForwardRef(Search16)>
         <label
           className="bx--label"
           htmlFor="custom-id"
@@ -84,34 +90,38 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <Close16
-            height={16}
-            preserveAspectRatio="xMidYMid meet"
+          <ForwardRef(Close16)
             role="img"
-            viewBox="0 0 16 16"
-            width={16}
-            xmlns="http://www.w3.org/2000/svg"
           >
-            <svg
-              aria-hidden={true}
-              focusable="false"
+            <Icon
               height={16}
               preserveAspectRatio="xMidYMid meet"
               role="img"
-              style={
-                Object {
-                  "willChange": "transform",
-                }
-              }
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
-              />
-            </svg>
-          </Close16>
+              <svg
+                aria-hidden={true}
+                focusable="false"
+                height={16}
+                preserveAspectRatio="xMidYMid meet"
+                role="img"
+                style={
+                  Object {
+                    "willChange": "transform",
+                  }
+                }
+                viewBox="0 0 16 16"
+                width={16}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
+                />
+              </svg>
+            </Icon>
+          </ForwardRef(Close16)>
         </button>
       </div>
     </Search>
diff --git a/packages/react/src/components/DataTable/stories/with-batch-actions.js b/packages/react/src/components/DataTable/stories/with-batch-actions.js
index b1897fb277e5..5beed9b0069e 100644
--- a/packages/react/src/components/DataTable/stories/with-batch-actions.js
+++ b/packages/react/src/components/DataTable/stories/with-batch-actions.js
@@ -7,9 +7,11 @@
 
 import React from 'react';
 import { action } from '@storybook/addon-actions';
-import Delete from '@carbon/icons-react/lib/delete/16';
-import Save from '@carbon/icons-react/lib/save/16';
-import Download from '@carbon/icons-react/lib/download/16';
+import {
+  Delete16 as Delete,
+  Save16 as Save,
+  Download16 as Download,
+} from '@carbon/icons-react';
 
 import Button from '../../Button';
 import DataTable, {
diff --git a/packages/react/src/components/DataTable/stories/with-dynamic-content.js b/packages/react/src/components/DataTable/stories/with-dynamic-content.js
index 7cc4fd88d3ad..d58d89aa4196 100644
--- a/packages/react/src/components/DataTable/stories/with-dynamic-content.js
+++ b/packages/react/src/components/DataTable/stories/with-dynamic-content.js
@@ -6,9 +6,11 @@
  */
 
 import React from 'react';
-import Delete from '@carbon/icons-react/lib/delete/16';
-import Save from '@carbon/icons-react/lib/save/16';
-import Download from '@carbon/icons-react/lib/download/16';
+import {
+  Delete16 as Delete,
+  Save16 as Save,
+  Download16 as Download,
+} from '@carbon/icons-react';
 
 import DataTable, {
   Table,
diff --git a/packages/react/src/components/DatePickerInput/DatePickerInput.js b/packages/react/src/components/DatePickerInput/DatePickerInput.js
index c78193d764db..d7c63d311f95 100644
--- a/packages/react/src/components/DatePickerInput/DatePickerInput.js
+++ b/packages/react/src/components/DatePickerInput/DatePickerInput.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import Calendar16 from '@carbon/icons-react/lib/calendar/16';
+import { Calendar16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
index fed1f2096047..1ca562fcac93 100644
--- a/packages/react/src/components/Dropdown/Dropdown.js
+++ b/packages/react/src/components/Dropdown/Dropdown.js
@@ -10,7 +10,7 @@ import Downshift from 'downshift';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 import ListBox, { PropTypes as ListBoxPropTypes } from '../ListBox';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
index 6557fb707015..98810debc2eb 100644
--- a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
+++ b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
@@ -124,39 +124,44 @@ exports[`Dropdown should render 1`] = `
                   className="bx--list-box__menu-icon"
                   role="button"
                 >
-                  <ChevronDown16
+                  <ForwardRef(ChevronDown16)
                     aria-label="Open menu"
-                    height={16}
                     name="chevron--down"
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
                   >
-                    <svg
+                    <Icon
                       aria-label="Open menu"
-                      focusable="false"
                       height={16}
                       name="chevron--down"
                       preserveAspectRatio="xMidYMid meet"
-                      role="img"
-                      style={
-                        Object {
-                          "willChange": "transform",
-                        }
-                      }
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <title>
-                        Open menu
-                      </title>
-                      <path
-                        d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-                      />
-                    </svg>
-                  </ChevronDown16>
+                      <svg
+                        aria-label="Open menu"
+                        focusable="false"
+                        height={16}
+                        name="chevron--down"
+                        preserveAspectRatio="xMidYMid meet"
+                        role="img"
+                        style={
+                          Object {
+                            "willChange": "transform",
+                          }
+                        }
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+                        />
+                        <title>
+                          Open menu
+                        </title>
+                      </svg>
+                    </Icon>
+                  </ForwardRef(ChevronDown16)>
                 </div>
               </ListBoxMenuIcon>
             </div>
@@ -292,39 +297,44 @@ exports[`Dropdown should render custom item components 1`] = `
                   className="bx--list-box__menu-icon bx--list-box__menu-icon--open"
                   role="button"
                 >
-                  <ChevronDown16
+                  <ForwardRef(ChevronDown16)
                     aria-label="Close menu"
-                    height={16}
                     name="chevron--down"
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
                   >
-                    <svg
+                    <Icon
                       aria-label="Close menu"
-                      focusable="false"
                       height={16}
                       name="chevron--down"
                       preserveAspectRatio="xMidYMid meet"
-                      role="img"
-                      style={
-                        Object {
-                          "willChange": "transform",
-                        }
-                      }
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <title>
-                        Close menu
-                      </title>
-                      <path
-                        d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-                      />
-                    </svg>
-                  </ChevronDown16>
+                      <svg
+                        aria-label="Close menu"
+                        focusable="false"
+                        height={16}
+                        name="chevron--down"
+                        preserveAspectRatio="xMidYMid meet"
+                        role="img"
+                        style={
+                          Object {
+                            "willChange": "transform",
+                          }
+                        }
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+                        />
+                        <title>
+                          Close menu
+                        </title>
+                      </svg>
+                    </Icon>
+                  </ForwardRef(ChevronDown16)>
                 </div>
               </ListBoxMenuIcon>
             </div>
@@ -617,39 +627,44 @@ exports[`Dropdown should render with strings as items 1`] = `
                   className="bx--list-box__menu-icon bx--list-box__menu-icon--open"
                   role="button"
                 >
-                  <ChevronDown16
+                  <ForwardRef(ChevronDown16)
                     aria-label="Close menu"
-                    height={16}
                     name="chevron--down"
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
                   >
-                    <svg
+                    <Icon
                       aria-label="Close menu"
-                      focusable="false"
                       height={16}
                       name="chevron--down"
                       preserveAspectRatio="xMidYMid meet"
-                      role="img"
-                      style={
-                        Object {
-                          "willChange": "transform",
-                        }
-                      }
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <title>
-                        Close menu
-                      </title>
-                      <path
-                        d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-                      />
-                    </svg>
-                  </ChevronDown16>
+                      <svg
+                        aria-label="Close menu"
+                        focusable="false"
+                        height={16}
+                        name="chevron--down"
+                        preserveAspectRatio="xMidYMid meet"
+                        role="img"
+                        style={
+                          Object {
+                            "willChange": "transform",
+                          }
+                        }
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+                        />
+                        <title>
+                          Close menu
+                        </title>
+                      </svg>
+                    </Icon>
+                  </ForwardRef(ChevronDown16)>
                 </div>
               </ListBoxMenuIcon>
             </div>
diff --git a/packages/react/src/components/FileUploader/FileUploader-test.js b/packages/react/src/components/FileUploader/FileUploader-test.js
index c8363171fd35..9e9d0424b02e 100644
--- a/packages/react/src/components/FileUploader/FileUploader-test.js
+++ b/packages/react/src/components/FileUploader/FileUploader-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import CloseFilled16 from '@carbon/icons-react/lib/close--filled/16';
+import { CloseFilled16 } from '@carbon/icons-react';
 import FileUploader, { FileUploaderButton, Filename } from '../FileUploader';
 import FileUploaderSkeleton from '../FileUploader/FileUploader.Skeleton';
 import { mount, shallow } from 'enzyme';
diff --git a/packages/react/src/components/FileUploader/FileUploader.js b/packages/react/src/components/FileUploader/FileUploader.js
index 725bca2cda8b..b7285d60cd5c 100644
--- a/packages/react/src/components/FileUploader/FileUploader.js
+++ b/packages/react/src/components/FileUploader/FileUploader.js
@@ -12,8 +12,7 @@ import classNames from 'classnames';
 import { settings } from 'carbon-components';
 import uid from '../../tools/uniqueId';
 import { ButtonTypes } from '../../prop-types/types';
-import CloseFilled16 from '@carbon/icons-react/lib/close--filled/16';
-import CheckmarkFilled16 from '@carbon/icons-react/lib/checkmark--filled/16';
+import { CloseFilled16, CheckmarkFilled16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/ListBox/ListBox.js b/packages/react/src/components/ListBox/ListBox.js
index dcbd88ab2aef..83c91458ef13 100644
--- a/packages/react/src/components/ListBox/ListBox.js
+++ b/packages/react/src/components/ListBox/ListBox.js
@@ -13,7 +13,7 @@ import ListBoxField from './ListBoxField';
 import ListBoxMenu from './ListBoxMenu';
 import { ListBoxType } from './ListBoxPropTypes';
 import childrenOf from '../../prop-types/childrenOf';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/ListBox/ListBoxMenuIcon.js b/packages/react/src/components/ListBox/ListBoxMenuIcon.js
index 97ee5fc07ed1..df0374918542 100644
--- a/packages/react/src/components/ListBox/ListBoxMenuIcon.js
+++ b/packages/react/src/components/ListBox/ListBoxMenuIcon.js
@@ -8,7 +8,7 @@
 import cx from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
-import ChevronDown16 from '@carbon/icons-react/lib/chevron--down/16';
+import { ChevronDown16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/ListBox/ListBoxSelection.js b/packages/react/src/components/ListBox/ListBoxSelection.js
index fc11e732b66d..9b17787bcba4 100644
--- a/packages/react/src/components/ListBox/ListBoxSelection.js
+++ b/packages/react/src/components/ListBox/ListBoxSelection.js
@@ -8,7 +8,7 @@
 import cx from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
-import Close16 from '@carbon/icons-react/lib/close/16';
+import { Close16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
index 70b79735015b..5fdc0a63f0e3 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
@@ -24,34 +24,38 @@ exports[`ListBoxField should render 1`] = `
         tabIndex="0"
         title="Clear selected item"
       >
-        <Close16
-          height={16}
-          preserveAspectRatio="xMidYMid meet"
+        <ForwardRef(Close16)
           role="img"
-          viewBox="0 0 16 16"
-          width={16}
-          xmlns="http://www.w3.org/2000/svg"
         >
-          <svg
-            aria-hidden={true}
-            focusable="false"
+          <Icon
             height={16}
             preserveAspectRatio="xMidYMid meet"
             role="img"
-            style={
-              Object {
-                "willChange": "transform",
-              }
-            }
             viewBox="0 0 16 16"
             width={16}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
-            />
-          </svg>
-        </Close16>
+            <svg
+              aria-hidden={true}
+              focusable="false"
+              height={16}
+              preserveAspectRatio="xMidYMid meet"
+              role="img"
+              style={
+                Object {
+                  "willChange": "transform",
+                }
+              }
+              viewBox="0 0 16 16"
+              width={16}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
+              />
+            </svg>
+          </Icon>
+        </ForwardRef(Close16)>
       </div>
     </ListBoxSelection>
   </div>
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
index 44c2355178db..1eee0ff61b8c 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
@@ -9,39 +9,44 @@ exports[`ListBoxMenuIcon should render 1`] = `
     className="bx--list-box__menu-icon bx--list-box__menu-icon--open"
     role="button"
   >
-    <ChevronDown16
+    <ForwardRef(ChevronDown16)
       aria-label="Close menu"
-      height={16}
       name="chevron--down"
-      preserveAspectRatio="xMidYMid meet"
-      viewBox="0 0 16 16"
-      width={16}
-      xmlns="http://www.w3.org/2000/svg"
     >
-      <svg
+      <Icon
         aria-label="Close menu"
-        focusable="false"
         height={16}
         name="chevron--down"
         preserveAspectRatio="xMidYMid meet"
-        role="img"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 16 16"
         width={16}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <title>
-          Close menu
-        </title>
-        <path
-          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-        />
-      </svg>
-    </ChevronDown16>
+        <svg
+          aria-label="Close menu"
+          focusable="false"
+          height={16}
+          name="chevron--down"
+          preserveAspectRatio="xMidYMid meet"
+          role="img"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 16 16"
+          width={16}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+          />
+          <title>
+            Close menu
+          </title>
+        </svg>
+      </Icon>
+    </ForwardRef(ChevronDown16)>
   </div>
 </ListBoxMenuIcon>
 `;
@@ -55,39 +60,44 @@ exports[`ListBoxMenuIcon should render 2`] = `
     className="bx--list-box__menu-icon"
     role="button"
   >
-    <ChevronDown16
+    <ForwardRef(ChevronDown16)
       aria-label="Open menu"
-      height={16}
       name="chevron--down"
-      preserveAspectRatio="xMidYMid meet"
-      viewBox="0 0 16 16"
-      width={16}
-      xmlns="http://www.w3.org/2000/svg"
     >
-      <svg
+      <Icon
         aria-label="Open menu"
-        focusable="false"
         height={16}
         name="chevron--down"
         preserveAspectRatio="xMidYMid meet"
-        role="img"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 16 16"
         width={16}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <title>
-          Open menu
-        </title>
-        <path
-          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-        />
-      </svg>
-    </ChevronDown16>
+        <svg
+          aria-label="Open menu"
+          focusable="false"
+          height={16}
+          name="chevron--down"
+          preserveAspectRatio="xMidYMid meet"
+          role="img"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 16 16"
+          width={16}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+          />
+          <title>
+            Open menu
+          </title>
+        </svg>
+      </Icon>
+    </ForwardRef(ChevronDown16)>
   </div>
 </ListBoxMenuIcon>
 `;
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
index cd9e700906db..bcb44cafc7f4 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
@@ -34,34 +34,38 @@ exports[`ListBoxSelection should render 1`] = `
     tabIndex="0"
     title="translation"
   >
-    <Close16
-      height={16}
-      preserveAspectRatio="xMidYMid meet"
+    <ForwardRef(Close16)
       role="img"
-      viewBox="0 0 16 16"
-      width={16}
-      xmlns="http://www.w3.org/2000/svg"
     >
-      <svg
-        aria-hidden={true}
-        focusable="false"
+      <Icon
         height={16}
         preserveAspectRatio="xMidYMid meet"
         role="img"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 16 16"
         width={16}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <path
-          d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
-        />
-      </svg>
-    </Close16>
+        <svg
+          aria-hidden={true}
+          focusable="false"
+          height={16}
+          preserveAspectRatio="xMidYMid meet"
+          role="img"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 16 16"
+          width={16}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
+          />
+        </svg>
+      </Icon>
+    </ForwardRef(Close16)>
   </div>
 </ListBoxSelection>
 `;
@@ -102,34 +106,38 @@ exports[`ListBoxSelection should render 2`] = `
     title="translation"
   >
     3
-    <Close16
-      height={16}
-      preserveAspectRatio="xMidYMid meet"
+    <ForwardRef(Close16)
       role="img"
-      viewBox="0 0 16 16"
-      width={16}
-      xmlns="http://www.w3.org/2000/svg"
     >
-      <svg
-        aria-hidden={true}
-        focusable="false"
+      <Icon
         height={16}
         preserveAspectRatio="xMidYMid meet"
         role="img"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 16 16"
         width={16}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <path
-          d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
-        />
-      </svg>
-    </Close16>
+        <svg
+          aria-hidden={true}
+          focusable="false"
+          height={16}
+          preserveAspectRatio="xMidYMid meet"
+          role="img"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 16 16"
+          width={16}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M12 4.7l-.7-.7L8 7.3 4.7 4l-.7.7L7.3 8 4 11.3l.7.7L8 8.7l3.3 3.3.7-.7L8.7 8z"
+          />
+        </svg>
+      </Icon>
+    </ForwardRef(Close16)>
   </div>
 </ListBoxSelection>
 `;
diff --git a/packages/react/src/components/Modal/Modal-test.js b/packages/react/src/components/Modal/Modal-test.js
index f8b46d3fbf0c..41cda41132cc 100644
--- a/packages/react/src/components/Modal/Modal-test.js
+++ b/packages/react/src/components/Modal/Modal-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import Close20 from '@carbon/icons-react/lib/close/20';
+import { Close20 } from '@carbon/icons-react';
 import Modal from '../Modal';
 import ModalWrapper from '../ModalWrapper';
 import { shallow, mount } from 'enzyme';
diff --git a/packages/react/src/components/Modal/Modal.js b/packages/react/src/components/Modal/Modal.js
index 07a8a9bd8d29..4a6864b4faaa 100644
--- a/packages/react/src/components/Modal/Modal.js
+++ b/packages/react/src/components/Modal/Modal.js
@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import Button from '../Button';
 import { settings } from 'carbon-components';
-import Close20 from '@carbon/icons-react/lib/close/20';
+import { Close20 } from '@carbon/icons-react';
 import FocusTrap from 'focus-trap-react';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/ModalWrapper/ModalWrapper-story.js b/packages/react/src/components/ModalWrapper/ModalWrapper-story.js
index 6bf1e33455e0..74a0dc1b9d78 100644
--- a/packages/react/src/components/ModalWrapper/ModalWrapper-story.js
+++ b/packages/react/src/components/ModalWrapper/ModalWrapper-story.js
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { iconAddSolid, iconSearch } from 'carbon-icons';
-import AddFilled16 from '@carbon/icons-react/lib/add--filled/16';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { AddFilled16, Search16 } from '@carbon/icons-react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 
diff --git a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
index 16e3226dc114..ad416d17bf05 100644
--- a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
+++ b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
@@ -101,36 +101,41 @@ exports[`ModalWrapper should render 1`] = `
                 title="close the modal"
                 type="button"
               >
-                <Close20
+                <ForwardRef(Close20)
                   aria-label="close the modal"
                   className="bx--modal-close__icon"
-                  height={20}
-                  preserveAspectRatio="xMidYMid meet"
-                  viewBox="0 0 32 32"
-                  width={20}
-                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <svg
+                  <Icon
                     aria-label="close the modal"
                     className="bx--modal-close__icon"
-                    focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
-                    role="img"
-                    style={
-                      Object {
-                        "willChange": "transform",
-                      }
-                    }
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <path
-                      d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4l6.6 6.6L8 22.6 9.4 24l6.6-6.6 6.6 6.6 1.4-1.4-6.6-6.6L24 9.4z"
-                    />
-                  </svg>
-                </Close20>
+                    <svg
+                      aria-label="close the modal"
+                      className="bx--modal-close__icon"
+                      focusable="false"
+                      height={20}
+                      preserveAspectRatio="xMidYMid meet"
+                      role="img"
+                      style={
+                        Object {
+                          "willChange": "transform",
+                        }
+                      }
+                      viewBox="0 0 32 32"
+                      width={20}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4l6.6 6.6L8 22.6 9.4 24l6.6-6.6 6.6 6.6 1.4-1.4-6.6-6.6L24 9.4z"
+                      />
+                    </svg>
+                  </Icon>
+                </ForwardRef(Close20)>
               </button>
             </div>
             <div
diff --git a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
index 6dcc5a75ef44..affc5acc5796 100644
--- a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
+++ b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
@@ -11,7 +11,7 @@ import React from 'react';
 import Downshift from 'downshift';
 import isEqual from 'lodash.isequal';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 import ListBox from '../ListBox';
 import Checkbox from '../Checkbox';
 import Selection from '../../internal/Selection';
diff --git a/packages/react/src/components/MultiSelect/MultiSelect.js b/packages/react/src/components/MultiSelect/MultiSelect.js
index 58fb0b0856ef..38011613cbd8 100644
--- a/packages/react/src/components/MultiSelect/MultiSelect.js
+++ b/packages/react/src/components/MultiSelect/MultiSelect.js
@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import Downshift from 'downshift';
 import isEqual from 'lodash.isequal';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 import ListBox from '../ListBox';
 import Checkbox from '../Checkbox';
 import Selection from '../../internal/Selection';
diff --git a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
index 1d903bc86c7b..c7dbaf51f56d 100644
--- a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
+++ b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
@@ -144,39 +144,44 @@ exports[`MultiSelect.Filterable should render 1`] = `
                     className="bx--list-box__menu-icon"
                     role="button"
                   >
-                    <ChevronDown16
+                    <ForwardRef(ChevronDown16)
                       aria-label="Open menu"
-                      height={16}
                       name="chevron--down"
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
+                      <Icon
                         aria-label="Open menu"
-                        focusable="false"
                         height={16}
                         name="chevron--down"
                         preserveAspectRatio="xMidYMid meet"
-                        role="img"
-                        style={
-                          Object {
-                            "willChange": "transform",
-                          }
-                        }
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <title>
-                          Open menu
-                        </title>
-                        <path
-                          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-                        />
-                      </svg>
-                    </ChevronDown16>
+                        <svg
+                          aria-label="Open menu"
+                          focusable="false"
+                          height={16}
+                          name="chevron--down"
+                          preserveAspectRatio="xMidYMid meet"
+                          role="img"
+                          style={
+                            Object {
+                              "willChange": "transform",
+                            }
+                          }
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+                          />
+                          <title>
+                            Open menu
+                          </title>
+                        </svg>
+                      </Icon>
+                    </ForwardRef(ChevronDown16)>
                   </div>
                 </ListBoxMenuIcon>
               </div>
diff --git a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
index 1d3ebb7e9b40..b86e42aa6d45 100644
--- a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
+++ b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
@@ -132,39 +132,44 @@ exports[`MultiSelect should render 1`] = `
                     className="bx--list-box__menu-icon"
                     role="button"
                   >
-                    <ChevronDown16
+                    <ForwardRef(ChevronDown16)
                       aria-label="Open menu"
-                      height={16}
                       name="chevron--down"
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
+                      <Icon
                         aria-label="Open menu"
-                        focusable="false"
                         height={16}
                         name="chevron--down"
                         preserveAspectRatio="xMidYMid meet"
-                        role="img"
-                        style={
-                          Object {
-                            "willChange": "transform",
-                          }
-                        }
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <title>
-                          Open menu
-                        </title>
-                        <path
-                          d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
-                        />
-                      </svg>
-                    </ChevronDown16>
+                        <svg
+                          aria-label="Open menu"
+                          focusable="false"
+                          height={16}
+                          name="chevron--down"
+                          preserveAspectRatio="xMidYMid meet"
+                          role="img"
+                          style={
+                            Object {
+                              "willChange": "transform",
+                            }
+                          }
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M8 11L3 6l.7-.7L8 9.6l4.3-4.3.7.7z"
+                          />
+                          <title>
+                            Open menu
+                          </title>
+                        </svg>
+                      </Icon>
+                    </ForwardRef(ChevronDown16)>
                   </div>
                 </ListBoxMenuIcon>
               </div>
diff --git a/packages/react/src/components/Notification/Notification-test.js b/packages/react/src/components/Notification/Notification-test.js
index 8c4bd181cf8f..366b13bf1d33 100644
--- a/packages/react/src/components/Notification/Notification-test.js
+++ b/packages/react/src/components/Notification/Notification-test.js
@@ -6,9 +6,7 @@
  */
 
 import React from 'react';
-import Close16 from '@carbon/icons-react/lib/close/16';
-import ErrorFilled20 from '@carbon/icons-react/lib/error--filled/20';
-import CheckmarkFilled20 from '@carbon/icons-react/lib/checkmark--filled/20';
+import { Close16, ErrorFilled20, CheckmarkFilled20 } from '@carbon/icons-react';
 import {
   NotificationButton,
   NotificationTextDetails,
diff --git a/packages/react/src/components/Notification/Notification.js b/packages/react/src/components/Notification/Notification.js
index e40af606e75c..b10dc8b41205 100644
--- a/packages/react/src/components/Notification/Notification.js
+++ b/packages/react/src/components/Notification/Notification.js
@@ -9,10 +9,12 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import Close16 from '@carbon/icons-react/lib/close/16';
-import ErrorFilled20 from '@carbon/icons-react/lib/error--filled/20';
-import CheckmarkFilled20 from '@carbon/icons-react/lib/checkmark--filled/20';
-import WarningFilled20 from '@carbon/icons-react/lib/warning--filled/20';
+import {
+  Close16,
+  ErrorFilled20,
+  CheckmarkFilled20,
+  WarningFilled20,
+} from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/NumberInput/NumberInput-test.js b/packages/react/src/components/NumberInput/NumberInput-test.js
index 701eae963f15..e1cbfdf71527 100644
--- a/packages/react/src/components/NumberInput/NumberInput-test.js
+++ b/packages/react/src/components/NumberInput/NumberInput-test.js
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { mount, shallow } from 'enzyme';
-import CaretDownGlyph from '@carbon/icons-react/lib/caret--down/index';
-import CaretUpGlyph from '@carbon/icons-react/lib/caret--up/index';
+import { CaretDownGlyph, CaretUpGlyph } from '@carbon/icons-react';
 import NumberInput from '../NumberInput';
 import NumberInputSkeleton from '../NumberInput/NumberInput.Skeleton';
 import { settings } from 'carbon-components';
diff --git a/packages/react/src/components/NumberInput/NumberInput.js b/packages/react/src/components/NumberInput/NumberInput.js
index b2a4c45f4cf7..90afa6f41676 100644
--- a/packages/react/src/components/NumberInput/NumberInput.js
+++ b/packages/react/src/components/NumberInput/NumberInput.js
@@ -9,9 +9,11 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
-import CaretDownGlyph from '@carbon/icons-react/lib/caret--down/index';
-import CaretUpGlyph from '@carbon/icons-react/lib/caret--up/index';
+import {
+  WarningFilled16,
+  CaretDownGlyph,
+  CaretUpGlyph,
+} from '@carbon/icons-react';
 import mergeRefs from '../../tools/mergeRefs';
 import requiredIfValueExists from '../../prop-types/requiredIfValueExists';
 import { useControlledStateWithValue } from '../../internal/FeatureFlags';
diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-test.js b/packages/react/src/components/OverflowMenu/OverflowMenu-test.js
index 95cbbcc15390..7f3f8a399f70 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu-test.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu-test.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import OverflowMenu from '../OverflowMenu';
-import OverflowMenuVertical16 from '@carbon/icons-react/lib/overflow-menu--vertical/16';
+import { OverflowMenuVertical16 } from '@carbon/icons-react';
 import { mount } from 'enzyme';
 import { settings } from 'carbon-components';
 
diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu.js b/packages/react/src/components/OverflowMenu/OverflowMenu.js
index c2abb27b42b1..be394e3577f5 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu.js
@@ -16,7 +16,7 @@ import FloatingMenu, {
   DIRECTION_BOTTOM,
 } from '../../internal/FloatingMenu';
 import OptimizedResize from '../../internal/OptimizedResize';
-import OverflowMenuVertical16 from '@carbon/icons-react/lib/overflow-menu--vertical/16';
+import { OverflowMenuVertical16 } from '@carbon/icons-react';
 import { keys, matches as keyCodeMatches } from '../../tools/key';
 import mergeRefs from '../../tools/mergeRefs';
 
diff --git a/packages/react/src/components/Pagination/Pagination-test.js b/packages/react/src/components/Pagination/Pagination-test.js
index ec97afb3a99d..6706f1e00310 100644
--- a/packages/react/src/components/Pagination/Pagination-test.js
+++ b/packages/react/src/components/Pagination/Pagination-test.js
@@ -6,8 +6,7 @@
  */
 
 import React from 'react';
-import CaretRight24 from '@carbon/icons-react/lib/caret--right/24';
-import CaretLeft24 from '@carbon/icons-react/lib/caret--left/24';
+import { CaretRight24, CaretLeft24 } from '@carbon/icons-react';
 import Pagination from '../Pagination';
 import Select from '../Select';
 import SelectItem from '../SelectItem';
diff --git a/packages/react/src/components/Pagination/Pagination.js b/packages/react/src/components/Pagination/Pagination.js
index b528f847a9fc..b73324cbea17 100644
--- a/packages/react/src/components/Pagination/Pagination.js
+++ b/packages/react/src/components/Pagination/Pagination.js
@@ -8,8 +8,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classnames from 'classnames';
-import CaretRight24 from '@carbon/icons-react/lib/caret--right/24';
-import CaretLeft24 from '@carbon/icons-react/lib/caret--left/24';
+import { CaretRight24, CaretLeft24 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import Select from '../Select';
 import SelectItem from '../SelectItem';
diff --git a/packages/react/src/components/PrimaryButton/PrimaryButton-test.js b/packages/react/src/components/PrimaryButton/PrimaryButton-test.js
index f35e8d2f7590..537c26515f3c 100644
--- a/packages/react/src/components/PrimaryButton/PrimaryButton-test.js
+++ b/packages/react/src/components/PrimaryButton/PrimaryButton-test.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import PrimaryButton from '../PrimaryButton';
 import { shallow, mount } from 'enzyme';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { Search16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/ProgressIndicator/ProgressIndicator.js b/packages/react/src/components/ProgressIndicator/ProgressIndicator.js
index 92850fc81173..5985f56c2de1 100644
--- a/packages/react/src/components/ProgressIndicator/ProgressIndicator.js
+++ b/packages/react/src/components/ProgressIndicator/ProgressIndicator.js
@@ -9,8 +9,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { settings } from 'carbon-components';
-import CheckmarkOutline16 from '@carbon/icons-react/lib/checkmark--outline/16';
-import Warning16 from '@carbon/icons-react/lib/warning/16';
+import { CheckmarkOutline16, Warning16 } from '@carbon/icons-react';
 import { keys, matches } from '../../tools/key';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/RadioTile/RadioTile.js b/packages/react/src/components/RadioTile/RadioTile.js
index dcda3b1456d1..432a8eb43b90 100644
--- a/packages/react/src/components/RadioTile/RadioTile.js
+++ b/packages/react/src/components/RadioTile/RadioTile.js
@@ -10,7 +10,7 @@ import React from 'react';
 import uid from '../../tools/uniqueId';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import CheckmarkFilled from '@carbon/icons-react/lib/checkmark--filled/16';
+import { CheckmarkFilled16 as CheckmarkFilled } from '@carbon/icons-react';
 import { keys, matches } from '../../tools/key';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Search/Search-test.js b/packages/react/src/components/Search/Search-test.js
index fb980a4efadd..dda7a123d8d8 100644
--- a/packages/react/src/components/Search/Search-test.js
+++ b/packages/react/src/components/Search/Search-test.js
@@ -6,8 +6,7 @@
  */
 
 import React from 'react';
-import Search16 from '@carbon/icons-react/lib/search/16';
-import Close20 from '@carbon/icons-react/lib/close/20';
+import { Search16, Close20 } from '@carbon/icons-react';
 import Search from '../Search';
 import SearchSkeleton from '../Search/Search.Skeleton';
 import { mount, shallow } from 'enzyme';
diff --git a/packages/react/src/components/Search/Search.js b/packages/react/src/components/Search/Search.js
index e8b678e25db7..454508c415d2 100644
--- a/packages/react/src/components/Search/Search.js
+++ b/packages/react/src/components/Search/Search.js
@@ -8,9 +8,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
-import Search16 from '@carbon/icons-react/lib/search/16';
-import Close16 from '@carbon/icons-react/lib/close/16';
-import Close20 from '@carbon/icons-react/lib/close/20';
+import { Search16, Close16, Close20 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/SearchFilterButton/SearchFilterButton-test.js b/packages/react/src/components/SearchFilterButton/SearchFilterButton-test.js
index f5c076e3d2d9..bb73da417cd4 100644
--- a/packages/react/src/components/SearchFilterButton/SearchFilterButton-test.js
+++ b/packages/react/src/components/SearchFilterButton/SearchFilterButton-test.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import SearchFilterButton from '../SearchFilterButton';
 import { mount } from 'enzyme';
-import Filter16 from '@carbon/icons-react/lib/filter/16';
+import { Filter16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/SearchFilterButton/SearchFilterButton.js b/packages/react/src/components/SearchFilterButton/SearchFilterButton.js
index 52eeea165721..e38f24d7a00c 100644
--- a/packages/react/src/components/SearchFilterButton/SearchFilterButton.js
+++ b/packages/react/src/components/SearchFilterButton/SearchFilterButton.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { settings } from 'carbon-components';
-import Filter16 from '@carbon/icons-react/lib/filter/16';
+import { Filter16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/SearchLayoutButton/SearchLayoutButton-test.js b/packages/react/src/components/SearchLayoutButton/SearchLayoutButton-test.js
index f9063a6577c3..1da50801fb81 100644
--- a/packages/react/src/components/SearchLayoutButton/SearchLayoutButton-test.js
+++ b/packages/react/src/components/SearchLayoutButton/SearchLayoutButton-test.js
@@ -6,8 +6,7 @@
  */
 
 import React from 'react';
-import ListBulleted16 from '@carbon/icons-react/lib/list--bulleted/16';
-import Grid16 from '@carbon/icons-react/lib/grid/16';
+import { ListBulleted16, Grid16 } from '@carbon/icons-react';
 import SearchLayoutButton from '../SearchLayoutButton';
 import { shallow, mount } from 'enzyme';
 import { settings } from 'carbon-components';
diff --git a/packages/react/src/components/SearchLayoutButton/SearchLayoutButton.js b/packages/react/src/components/SearchLayoutButton/SearchLayoutButton.js
index 979ebed02796..8a714850c167 100644
--- a/packages/react/src/components/SearchLayoutButton/SearchLayoutButton.js
+++ b/packages/react/src/components/SearchLayoutButton/SearchLayoutButton.js
@@ -8,8 +8,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { settings } from 'carbon-components';
-import ListBulleted16 from '@carbon/icons-react/lib/list--bulleted/16';
-import Grid16 from '@carbon/icons-react/lib/grid/16';
+import { ListBulleted16, Grid16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/SecondaryButton/SecondaryButton-test.js b/packages/react/src/components/SecondaryButton/SecondaryButton-test.js
index 4bba635c2f9f..aa9909a761ed 100644
--- a/packages/react/src/components/SecondaryButton/SecondaryButton-test.js
+++ b/packages/react/src/components/SecondaryButton/SecondaryButton-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { Search16 } from '@carbon/icons-react';
 import SecondaryButton from '../SecondaryButton';
 import { shallow, mount } from 'enzyme';
 import { settings } from 'carbon-components';
diff --git a/packages/react/src/components/Select/Select-test.js b/packages/react/src/components/Select/Select-test.js
index 381ccbbd60d5..744f8b79c550 100644
--- a/packages/react/src/components/Select/Select-test.js
+++ b/packages/react/src/components/Select/Select-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down/index';
+import { ChevronDownGlyph } from '@carbon/icons-react';
 import Select from '../Select';
 import SelectItem from '../SelectItem';
 import SelectSkeleton from '../Select/Select.Skeleton';
diff --git a/packages/react/src/components/Select/Select.js b/packages/react/src/components/Select/Select.js
index d1fdcedde00d..20fc7010fa1c 100644
--- a/packages/react/src/components/Select/Select.js
+++ b/packages/react/src/components/Select/Select.js
@@ -9,8 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down/index';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { ChevronDownGlyph, WarningFilled16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/StructuredList/StructuredList-story.js b/packages/react/src/components/StructuredList/StructuredList-story.js
index 48a4fd942972..54477e6925f6 100644
--- a/packages/react/src/components/StructuredList/StructuredList-story.js
+++ b/packages/react/src/components/StructuredList/StructuredList-story.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import CheckmarkFilled16 from '@carbon/icons-react/lib/checkmark--filled/16';
+import { CheckmarkFilled16 } from '@carbon/icons-react';
 import {
   StructuredListWrapper,
   StructuredListHead,
diff --git a/packages/react/src/components/Tabs/Tabs-test.js b/packages/react/src/components/Tabs/Tabs-test.js
index 4e0da0d1d592..ec6e7e7ebe67 100644
--- a/packages/react/src/components/Tabs/Tabs-test.js
+++ b/packages/react/src/components/Tabs/Tabs-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down/index';
+import { ChevronDownGlyph } from '@carbon/icons-react';
 import Tabs from '../Tabs';
 import Tab from '../Tab';
 import TabsSkeleton from '../Tabs/Tabs.Skeleton';
diff --git a/packages/react/src/components/Tabs/Tabs.js b/packages/react/src/components/Tabs/Tabs.js
index 79decb94c64b..beb7f77aa9de 100644
--- a/packages/react/src/components/Tabs/Tabs.js
+++ b/packages/react/src/components/Tabs/Tabs.js
@@ -8,7 +8,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down/index';
+import { ChevronDownGlyph } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Tag/Tag.js b/packages/react/src/components/Tag/Tag.js
index 5e8ea0d3acce..2f1cb6e4d251 100644
--- a/packages/react/src/components/Tag/Tag.js
+++ b/packages/react/src/components/Tag/Tag.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import Close16 from '@carbon/icons-react/lib/close/16';
+import { Close16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/TextArea/TextArea.js b/packages/react/src/components/TextArea/TextArea.js
index 944c5ecd42ec..f7c83f529d6e 100644
--- a/packages/react/src/components/TextArea/TextArea.js
+++ b/packages/react/src/components/TextArea/TextArea.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
diff --git a/packages/react/src/components/TextInput/ControlledPasswordInput.js b/packages/react/src/components/TextInput/ControlledPasswordInput.js
index 91159737f622..e8e77533db58 100644
--- a/packages/react/src/components/TextInput/ControlledPasswordInput.js
+++ b/packages/react/src/components/TextInput/ControlledPasswordInput.js
@@ -2,9 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { settings } from 'carbon-components';
-import View16 from '@carbon/icons-react/lib/view/16';
-import ViewOff16 from '@carbon/icons-react/lib/view--off/16';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { View16, ViewOff16, WarningFilled16 } from '@carbon/icons-react';
 import { textInputProps } from './util';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/TextInput/PasswordInput.js b/packages/react/src/components/TextInput/PasswordInput.js
index 068084d0d364..1b3d32095cb7 100644
--- a/packages/react/src/components/TextInput/PasswordInput.js
+++ b/packages/react/src/components/TextInput/PasswordInput.js
@@ -2,9 +2,7 @@ import React, { useState } from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { settings } from 'carbon-components';
-import View16 from '@carbon/icons-react/lib/view/16';
-import ViewOff16 from '@carbon/icons-react/lib/view--off/16';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { View16, ViewOff16, WarningFilled16 } from '@carbon/icons-react';
 import { textInputProps } from './util';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/TextInput/TextInput.js b/packages/react/src/components/TextInput/TextInput.js
index 0d09a3becd14..a408a51da952 100644
--- a/packages/react/src/components/TextInput/TextInput.js
+++ b/packages/react/src/components/TextInput/TextInput.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import WarningFilled16 from '@carbon/icons-react/lib/warning--filled/16';
+import { WarningFilled16 } from '@carbon/icons-react';
 import PasswordInput from './PasswordInput';
 import ControlledPasswordInput from './ControlledPasswordInput';
 import { textInputProps } from './util';
diff --git a/packages/react/src/components/Tile/Tile-test.js b/packages/react/src/components/Tile/Tile-test.js
index 09531e810430..e54e6a3d670b 100644
--- a/packages/react/src/components/Tile/Tile-test.js
+++ b/packages/react/src/components/Tile/Tile-test.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import ChevronDown16 from '@carbon/icons-react/lib/chevron--down/16';
+import { ChevronDown16 } from '@carbon/icons-react';
 import {
   Tile,
   ClickableTile,
diff --git a/packages/react/src/components/Tile/Tile.js b/packages/react/src/components/Tile/Tile.js
index ddf64adde19a..da4fac5149a1 100644
--- a/packages/react/src/components/Tile/Tile.js
+++ b/packages/react/src/components/Tile/Tile.js
@@ -10,8 +10,10 @@ import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
-import CheckmarkFilled from '@carbon/icons-react/lib/checkmark--filled/16';
-import ChevronDown16 from '@carbon/icons-react/lib/chevron--down/16';
+import {
+  CheckmarkFilled16 as CheckmarkFilled,
+  ChevronDown16,
+} from '@carbon/icons-react';
 import { keys, matches } from '../../tools/key';
 import uid from '../../tools/uniqueId';
 
diff --git a/packages/react/src/components/TimePickerSelect/TimePickerSelect.js b/packages/react/src/components/TimePickerSelect/TimePickerSelect.js
index 054fbfc54c33..2e4ba396a0d2 100644
--- a/packages/react/src/components/TimePickerSelect/TimePickerSelect.js
+++ b/packages/react/src/components/TimePickerSelect/TimePickerSelect.js
@@ -8,7 +8,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down/index';
+import { ChevronDownGlyph } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Toolbar/Toolbar-story.js b/packages/react/src/components/Toolbar/Toolbar-story.js
index 512cc32ae2d1..67313acf96a6 100644
--- a/packages/react/src/components/Toolbar/Toolbar-story.js
+++ b/packages/react/src/components/Toolbar/Toolbar-story.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import Filter16 from '@carbon/icons-react/lib/filter/16';
+import { Filter16 } from '@carbon/icons-react';
 import Toolbar, {
   ToolbarItem,
   ToolbarTitle,
diff --git a/packages/react/src/components/ToolbarSearch/ToolbarSearch.js b/packages/react/src/components/ToolbarSearch/ToolbarSearch.js
index d2ea32001b2c..045227d2eaad 100644
--- a/packages/react/src/components/ToolbarSearch/ToolbarSearch.js
+++ b/packages/react/src/components/ToolbarSearch/ToolbarSearch.js
@@ -8,7 +8,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import Search16 from '@carbon/icons-react/lib/search/16';
+import { Search16 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import ClickListener from '../../internal/ClickListener';
 
diff --git a/packages/react/src/components/Tooltip/Tooltip-story.js b/packages/react/src/components/Tooltip/Tooltip-story.js
index e84b95aef028..b16462187eba 100644
--- a/packages/react/src/components/Tooltip/Tooltip-story.js
+++ b/packages/react/src/components/Tooltip/Tooltip-story.js
@@ -12,7 +12,7 @@ import { settings } from 'carbon-components';
 import { withKnobs, select, text, number } from '@storybook/addon-knobs';
 import Tooltip from '../Tooltip';
 
-import OverflowMenuVertical16 from '@carbon/icons-react/lib/overflow-menu--vertical/16';
+import { OverflowMenuVertical16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 const directions = {
diff --git a/packages/react/src/components/Tooltip/Tooltip-test.js b/packages/react/src/components/Tooltip/Tooltip-test.js
index ed4f6b37f811..cfc2ae360f2c 100644
--- a/packages/react/src/components/Tooltip/Tooltip-test.js
+++ b/packages/react/src/components/Tooltip/Tooltip-test.js
@@ -7,12 +7,14 @@
 
 import React, { Component } from 'react';
 import debounce from 'lodash.debounce';
-import Information from '@carbon/icons-react/lib/information/16';
-import Add from '@carbon/icons-react/lib/add/16';
 import FloatingMenu from '../../internal/FloatingMenu';
 import Tooltip from '../Tooltip';
 import { mount } from 'enzyme';
-import OverflowMenuVertical16 from '@carbon/icons-react/lib/overflow-menu--vertical/16';
+import {
+  Information16 as Information,
+  Add16 as Add,
+  OverflowMenuVertical16,
+} from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 
 const { prefix } = settings;
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
index f7bc898c7e69..194ab9343f0a 100644
--- a/packages/react/src/components/Tooltip/Tooltip.js
+++ b/packages/react/src/components/Tooltip/Tooltip.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { isForwardRef } from 'react-is';
 import debounce from 'lodash.debounce';
 import classNames from 'classnames';
-import Information from '@carbon/icons-react/lib/information/16';
+import { Information16 as Information } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import FloatingMenu, {
   DIRECTION_LEFT,
diff --git a/packages/react/src/components/TooltipIcon/TooltipIcon-story.js b/packages/react/src/components/TooltipIcon/TooltipIcon-story.js
index 276be2104790..35f42f591fe0 100644
--- a/packages/react/src/components/TooltipIcon/TooltipIcon-story.js
+++ b/packages/react/src/components/TooltipIcon/TooltipIcon-story.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import Filter16 from '@carbon/icons-react/lib/filter/16';
+import { Filter16 } from '@carbon/icons-react';
 import { withKnobs, select, text } from '@storybook/addon-knobs';
 import TooltipIcon from '../TooltipIcon';
 
diff --git a/packages/react/src/components/UIShell/HeaderMenu.js b/packages/react/src/components/UIShell/HeaderMenu.js
index d150a150b602..53fce18fbcc6 100644
--- a/packages/react/src/components/UIShell/HeaderMenu.js
+++ b/packages/react/src/components/UIShell/HeaderMenu.js
@@ -1,11 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import ChevronDownGlyph from '@carbon/icons-react/lib/chevron--down';
+import { ChevronDownGlyph } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import cx from 'classnames';
 import React from 'react';
diff --git a/packages/react/src/components/UIShell/HeaderMenuButton.js b/packages/react/src/components/UIShell/HeaderMenuButton.js
index ff36869573e0..70108522e3f4 100644
--- a/packages/react/src/components/UIShell/HeaderMenuButton.js
+++ b/packages/react/src/components/UIShell/HeaderMenuButton.js
@@ -1,12 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Close20 from '@carbon/icons-react/lib/close/20';
-import Menu20 from '@carbon/icons-react/lib/menu/20';
+import { Close20, Menu20 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import cx from 'classnames';
 import React from 'react';
diff --git a/packages/react/src/components/UIShell/SideNavFooter.js b/packages/react/src/components/UIShell/SideNavFooter.js
index 5162d003a7d4..7fbd72130be1 100644
--- a/packages/react/src/components/UIShell/SideNavFooter.js
+++ b/packages/react/src/components/UIShell/SideNavFooter.js
@@ -1,12 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Close20 from '@carbon/icons-react/lib/close/20';
-import ChevronRight20 from '@carbon/icons-react/lib/chevron--right/20';
+import { Close20, ChevronRight20 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import cx from 'classnames';
 import React from 'react';
diff --git a/packages/react/src/components/UIShell/SideNavMenu.js b/packages/react/src/components/UIShell/SideNavMenu.js
index cbafa7073bb1..fbc74e3cc63d 100644
--- a/packages/react/src/components/UIShell/SideNavMenu.js
+++ b/packages/react/src/components/UIShell/SideNavMenu.js
@@ -1,11 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import ChevronDown20 from '@carbon/icons-react/lib/chevron--down/20';
+import { ChevronDown20 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
diff --git a/packages/react/src/components/UIShell/SideNavSwitcher.js b/packages/react/src/components/UIShell/SideNavSwitcher.js
index 2feb6cea5850..128c046a99c6 100644
--- a/packages/react/src/components/UIShell/SideNavSwitcher.js
+++ b/packages/react/src/components/UIShell/SideNavSwitcher.js
@@ -1,11 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import ChevronDown20 from '@carbon/icons-react/lib/chevron--down/20';
+import { ChevronDown20 } from '@carbon/icons-react';
 import { settings } from 'carbon-components';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
diff --git a/packages/react/src/components/UIShell/UIShell-story.js b/packages/react/src/components/UIShell/UIShell-story.js
index 47188539bdd7..fbff5ac45188 100644
--- a/packages/react/src/components/UIShell/UIShell-story.js
+++ b/packages/react/src/components/UIShell/UIShell-story.js
@@ -1,13 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Search20 from '@carbon/icons-react/lib/search/20';
-import Notification20 from '@carbon/icons-react/lib/notification/20';
-import AppSwitcher20 from '@carbon/icons-react/lib/app-switcher/20';
+import { Search20, Notification20, AppSwitcher20 } from '@carbon/icons-react';
 
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
diff --git a/packages/react/src/components/UIShell/__tests__/HeaderGlobalAction-test.js b/packages/react/src/components/UIShell/__tests__/HeaderGlobalAction-test.js
index 6270dc0ecbd6..4beb89f9d799 100644
--- a/packages/react/src/components/UIShell/__tests__/HeaderGlobalAction-test.js
+++ b/packages/react/src/components/UIShell/__tests__/HeaderGlobalAction-test.js
@@ -1,11 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Fade32 from '@carbon/icons-react/lib/fade/32';
+import { Fade32 } from '@carbon/icons-react';
 import React from 'react';
 import { mount } from 'enzyme';
 import { HeaderGlobalAction } from '../';
diff --git a/packages/react/src/components/UIShell/__tests__/HeaderMenuButton-test.js b/packages/react/src/components/UIShell/__tests__/HeaderMenuButton-test.js
index 535f4db5adb6..8be64d5100cc 100644
--- a/packages/react/src/components/UIShell/__tests__/HeaderMenuButton-test.js
+++ b/packages/react/src/components/UIShell/__tests__/HeaderMenuButton-test.js
@@ -1,11 +1,4 @@
-/**
- * Copyright IBM Corp. 2016, 2018
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Fade32 from '@carbon/icons-react/lib/fade/32';
+import { Fade32 } from '@carbon/icons-react';
 import React from 'react';
 import { mount } from 'enzyme';
 import { HeaderMenuButton } from '../';
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
index 9ee21c3a492e..b95b81e20500 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
@@ -13,32 +13,34 @@ exports[`HeaderGlobalAction should render 1`] = `
     onClick={[MockFunction]}
     type="button"
   >
-    <Fade32
-      height={32}
-      preserveAspectRatio="xMidYMid meet"
-      viewBox="0 0 32 32"
-      width={32}
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <svg
-        aria-hidden={true}
-        focusable="false"
+    <ForwardRef(Fade32)>
+      <Icon
         height={32}
         preserveAspectRatio="xMidYMid meet"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 32 32"
         width={32}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <path
-          d="M8.24 25.14L7 26.67a13.79 13.79 0 0 0 4.18 2.44l.69-1.87a12 12 0 0 1-3.63-2.1zM4.19 18l-2 .41A14.09 14.09 0 0 0 3.86 23l1.73-1a12.44 12.44 0 0 1-1.4-4zm7.63-13.24l-.69-1.87A13.79 13.79 0 0 0 7 5.33l1.24 1.53a12 12 0 0 1 3.58-2.1zM5.59 10L3.86 9a14.37 14.37 0 0 0-1.64 4.59l2 .34A12.05 12.05 0 0 1 5.59 10zM16 2v2a12 12 0 0 1 0 24v2a14 14 0 0 0 0-28z"
-        />
-      </svg>
-    </Fade32>
+        <svg
+          aria-hidden={true}
+          focusable="false"
+          height={32}
+          preserveAspectRatio="xMidYMid meet"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 32 32"
+          width={32}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M8.24 25.14L7 26.67a13.79 13.79 0 0 0 4.18 2.44l.69-1.87a12 12 0 0 1-3.63-2.1zM4.19 18l-2 .41A14.09 14.09 0 0 0 3.86 23l1.73-1a12.44 12.44 0 0 1-1.4-4zm7.63-13.24l-.69-1.87A13.79 13.79 0 0 0 7 5.33l1.24 1.53a12 12 0 0 1 3.58-2.1zM5.59 10L3.86 9a14.37 14.37 0 0 0-1.64 4.59l2 .34A12.05 12.05 0 0 1 5.59 10zM16 2v2a12 12 0 0 1 0 24v2a14 14 0 0 0 0-28z"
+          />
+        </svg>
+      </Icon>
+    </ForwardRef(Fade32)>
   </button>
 </HeaderGlobalAction>
 `;
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
index 0f78b66a24aa..be53212e0e4a 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
@@ -22,34 +22,38 @@ exports[`HeaderMenu should render 1`] = `
         tabIndex={0}
       >
         <defaultRenderMenuContent>
-          <ChevronDownGlyph
+          <ForwardRef(ChevronDownGlyph)
             className="bx--header__menu-arrow"
-            height={6}
-            preserveAspectRatio="xMidYMid meet"
-            viewBox="0 0 10 6"
-            width={10}
-            xmlns="http://www.w3.org/2000/svg"
           >
-            <svg
-              aria-hidden={true}
+            <Icon
               className="bx--header__menu-arrow"
-              focusable="false"
               height={6}
               preserveAspectRatio="xMidYMid meet"
-              style={
-                Object {
-                  "willChange": "transform",
-                }
-              }
               viewBox="0 0 10 6"
               width={10}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M5 6L0 1 .7.3 5 4.6 9.3.3l.7.7z"
-              />
-            </svg>
-          </ChevronDownGlyph>
+              <svg
+                aria-hidden={true}
+                className="bx--header__menu-arrow"
+                focusable="false"
+                height={6}
+                preserveAspectRatio="xMidYMid meet"
+                style={
+                  Object {
+                    "willChange": "transform",
+                  }
+                }
+                viewBox="0 0 10 6"
+                width={10}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M5 6L0 1 .7.3 5 4.6 9.3.3l.7.7z"
+                />
+              </svg>
+            </Icon>
+          </ForwardRef(ChevronDownGlyph)>
         </defaultRenderMenuContent>
       </a>
       <ul
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
index cf634cd313ad..9a0df8e9def9 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
@@ -14,32 +14,34 @@ exports[`HeaderMenuButton should render 1`] = `
     title="Accessibility label"
     type="button"
   >
-    <Menu20
-      height={20}
-      preserveAspectRatio="xMidYMid meet"
-      viewBox="0 0 20 20"
-      width={20}
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <svg
-        aria-hidden={true}
-        focusable="false"
+    <ForwardRef(Menu20)>
+      <Icon
         height={20}
         preserveAspectRatio="xMidYMid meet"
-        style={
-          Object {
-            "willChange": "transform",
-          }
-        }
         viewBox="0 0 20 20"
         width={20}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <path
-          d="M2 14.8h16V16H2zm0-3.6h16v1.2H2zm0-3.6h16v1.2H2zM2 4h16v1.2H2z"
-        />
-      </svg>
-    </Menu20>
+        <svg
+          aria-hidden={true}
+          focusable="false"
+          height={20}
+          preserveAspectRatio="xMidYMid meet"
+          style={
+            Object {
+              "willChange": "transform",
+            }
+          }
+          viewBox="0 0 20 20"
+          width={20}
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M2 14.8h16V16H2zm0-3.6h16v1.2H2zm0-3.6h16v1.2H2zM2 4h16v1.2H2z"
+          />
+        </svg>
+      </Icon>
+    </ForwardRef(Menu20)>
   </button>
 </HeaderMenuButton>
 `;
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
index 40440773f2b2..7aad2e515d1e 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNav-test.js.snap
@@ -33,32 +33,34 @@ exports[`SideNav should render 1`] = `
           <div
             className="bx--side-nav__icon"
           >
-            <ChevronRight20
-              height={20}
-              preserveAspectRatio="xMidYMid meet"
-              viewBox="0 0 32 32"
-              width={20}
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <svg
-                aria-hidden={true}
-                focusable="false"
+            <ForwardRef(ChevronRight20)>
+              <Icon
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
-                style={
-                  Object {
-                    "willChange": "transform",
-                  }
-                }
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
-                />
-              </svg>
-            </ChevronRight20>
+                <svg
+                  aria-hidden={true}
+                  focusable="false"
+                  height={20}
+                  preserveAspectRatio="xMidYMid meet"
+                  style={
+                    Object {
+                      "willChange": "transform",
+                    }
+                  }
+                  viewBox="0 0 32 32"
+                  width={20}
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
+                  />
+                </svg>
+              </Icon>
+            </ForwardRef(ChevronRight20)>
           </div>
           <span
             className="bx--assistive-text"
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
index 39f35b1d8c6b..e5bd43b21d81 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
@@ -18,32 +18,34 @@ exports[`SideNavFooter should render 1`] = `
       <div
         className="bx--side-nav__icon"
       >
-        <ChevronRight20
-          height={20}
-          preserveAspectRatio="xMidYMid meet"
-          viewBox="0 0 32 32"
-          width={20}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <svg
-            aria-hidden={true}
-            focusable="false"
+        <ForwardRef(ChevronRight20)>
+          <Icon
             height={20}
             preserveAspectRatio="xMidYMid meet"
-            style={
-              Object {
-                "willChange": "transform",
-              }
-            }
             viewBox="0 0 32 32"
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
-            />
-          </svg>
-        </ChevronRight20>
+            <svg
+              aria-hidden={true}
+              focusable="false"
+              height={20}
+              preserveAspectRatio="xMidYMid meet"
+              style={
+                Object {
+                  "willChange": "transform",
+                }
+              }
+              viewBox="0 0 32 32"
+              width={20}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
+              />
+            </svg>
+          </Icon>
+        </ForwardRef(ChevronRight20)>
       </div>
       <span
         className="bx--assistive-text"
@@ -73,32 +75,34 @@ exports[`SideNavFooter should render 2`] = `
       <div
         className="bx--side-nav__icon"
       >
-        <ChevronRight20
-          height={20}
-          preserveAspectRatio="xMidYMid meet"
-          viewBox="0 0 32 32"
-          width={20}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <svg
-            aria-hidden={true}
-            focusable="false"
+        <ForwardRef(ChevronRight20)>
+          <Icon
             height={20}
             preserveAspectRatio="xMidYMid meet"
-            style={
-              Object {
-                "willChange": "transform",
-              }
-            }
             viewBox="0 0 32 32"
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
-            />
-          </svg>
-        </ChevronRight20>
+            <svg
+              aria-hidden={true}
+              focusable="false"
+              height={20}
+              preserveAspectRatio="xMidYMid meet"
+              style={
+                Object {
+                  "willChange": "transform",
+                }
+              }
+              viewBox="0 0 32 32"
+              width={20}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M22 16L12 26l-1.4-1.4 8.6-8.6-8.6-8.6L12 6z"
+              />
+            </svg>
+          </Icon>
+        </ForwardRef(ChevronRight20)>
       </div>
       <span
         className="bx--assistive-text"
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
index 07f7402b26de..f12b828336b1 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
@@ -93,32 +93,34 @@ exports[`SideNavMenu should render 1`] = `
         <div
           className="bx--side-nav__icon bx--side-nav__icon--small bx--side-nav__submenu-chevron"
         >
-          <ChevronDown20
-            height={20}
-            preserveAspectRatio="xMidYMid meet"
-            viewBox="0 0 32 32"
-            width={20}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <svg
-              aria-hidden={true}
-              focusable="false"
+          <ForwardRef(ChevronDown20)>
+            <Icon
               height={20}
               preserveAspectRatio="xMidYMid meet"
-              style={
-                Object {
-                  "willChange": "transform",
-                }
-              }
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M16 22L6 12l1.4-1.4 8.6 8.6 8.6-8.6L26 12z"
-              />
-            </svg>
-          </ChevronDown20>
+              <svg
+                aria-hidden={true}
+                focusable="false"
+                height={20}
+                preserveAspectRatio="xMidYMid meet"
+                style={
+                  Object {
+                    "willChange": "transform",
+                  }
+                }
+                viewBox="0 0 32 32"
+                width={20}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M16 22L6 12l1.4-1.4 8.6 8.6 8.6-8.6L26 12z"
+                />
+              </svg>
+            </Icon>
+          </ForwardRef(ChevronDown20)>
         </div>
       </SideNavIcon>
     </button>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
index 551006c10b52..d2fdbcff75ed 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
@@ -62,32 +62,34 @@ exports[`SideNavSwitcher should render 1`] = `
     <div
       className="bx--side-nav__switcher-chevron"
     >
-      <ChevronDown20
-        height={20}
-        preserveAspectRatio="xMidYMid meet"
-        viewBox="0 0 32 32"
-        width={20}
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <svg
-          aria-hidden={true}
-          focusable="false"
+      <ForwardRef(ChevronDown20)>
+        <Icon
           height={20}
           preserveAspectRatio="xMidYMid meet"
-          style={
-            Object {
-              "willChange": "transform",
-            }
-          }
           viewBox="0 0 32 32"
           width={20}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M16 22L6 12l1.4-1.4 8.6 8.6 8.6-8.6L26 12z"
-          />
-        </svg>
-      </ChevronDown20>
+          <svg
+            aria-hidden={true}
+            focusable="false"
+            height={20}
+            preserveAspectRatio="xMidYMid meet"
+            style={
+              Object {
+                "willChange": "transform",
+              }
+            }
+            viewBox="0 0 32 32"
+            width={20}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M16 22L6 12l1.4-1.4 8.6 8.6 8.6-8.6L26 12z"
+            />
+          </svg>
+        </Icon>
+      </ForwardRef(ChevronDown20)>
     </div>
   </div>
 </ForwardRef(SideNavSwitcher)>