diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
index 6c34fb584..687b46c67 100644
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@@ -7,6 +7,10 @@
   rel="stylesheet"
   href="https://public.cdn.appfolio.com/public/icons/font-awesome/6.2.0/css/all.min.css"
 />
+<link
+  rel="stylesheet"
+  href="https://public.cdn.appfolio.com/public/icons/font-awesome/6.2.0/css/sharp-solid.min.css"
+/>
 <link
   rel="stylesheet"
   href="https://apm-prod-frontend-assets.s3.amazonaws.com/icons/font-awesome/5.14.0/css/v4-shims.min.css"
diff --git a/package.json b/package.json
index 23d6b8ba6..36222dafa 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,8 @@
     "react-dom": ">= 16.8"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.2.0",
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
     "@popperjs/core": "^2.10.1",
     "classnames": "^2.2.6",
     "credit-card-type": "^5.0.1",
@@ -65,7 +67,6 @@
     "lodash.without": "^4.4.0",
     "memoize-one": "^5.1.1",
     "prop-types": "^15.7.2",
-    "react-fontawesome": "^1.7.1",
     "react-imask": "^6.2.2",
     "react-resize-detector": "^4.2.3",
     "react-select-plus": "1.2.0",
diff --git a/src/components/Alert/Alert.spec.js b/src/components/Alert/Alert.spec.js
index 85ee3f932..7ea2b822c 100644
--- a/src/components/Alert/Alert.spec.js
+++ b/src/components/Alert/Alert.spec.js
@@ -24,9 +24,9 @@ describe('<Alert />', () => {
   });
 
   describe('with icon', () => {
-    it('should show exclamation-circle for warning', () => {
+    it('should show exclamation for warning', () => {
       const icon = shallow(<Alert icon color="warning" />).find(Icon);
-      assert.equal(icon.prop('name'), 'exclamation-circle');
+      assert.equal(icon.prop('name'), 'exclamation');
     });
 
     it('should show ban for danger', () => {
@@ -36,7 +36,7 @@ describe('<Alert />', () => {
 
     it('should show info for info', () => {
       const icon = shallow(<Alert icon color="info" />).find(Icon);
-      assert.equal(icon.prop('name'), 'info-circle');
+      assert.equal(icon.prop('name'), 'fa-info');
     });
 
     it('should show check for success', () => {
diff --git a/src/components/Alert/Alert.tsx b/src/components/Alert/Alert.tsx
index 6d11edba2..cd922fc0d 100644
--- a/src/components/Alert/Alert.tsx
+++ b/src/components/Alert/Alert.tsx
@@ -5,9 +5,9 @@ import Icon from '../Icon/Icon';
 const noop = () => undefined;
 
 const ICON_MAP: { [key: string]: string } = {
-  warning: 'exclamation-circle',
+  warning: 'exclamation',
   success: 'check',
-  info: 'info-circle',
+  info: 'info',
   danger: 'ban',
 };
 
@@ -50,7 +50,7 @@ const Alert: FC<Props> = ({
       {...props}
     >
       <div className="d-flex align-items-start">
-        {icon ? <Icon name={ICON_MAP[color]} size="lg" className="me-3 mt-1" /> : null}
+        {icon ? <Icon name={ICON_MAP[color]} size="lg" className="me-3 mt-2" /> : null}
         {icon ? (
           <div className="w-100" style={{ overflow: 'hidden' }}>
             {children}
diff --git a/src/components/BlockPanel/BlockPanel.stories.js b/src/components/BlockPanel/BlockPanel.stories.js
index f7e4d7e3a..08c244717 100644
--- a/src/components/BlockPanel/BlockPanel.stories.js
+++ b/src/components/BlockPanel/BlockPanel.stories.js
@@ -86,7 +86,7 @@ export const ComponentsForTitleAndControls = () => (
           <Icon name="list" />
         </Button>
         <Button>
-          <Icon name="th-list" />
+          <Icon name="table-list" />
         </Button>
       </ButtonGroup>,
     ]}
diff --git a/src/components/CollapsableText/CollapsableText.stories.js b/src/components/CollapsableText/CollapsableText.stories.js
index ac49dd9c8..a1c156562 100644
--- a/src/components/CollapsableText/CollapsableText.stories.js
+++ b/src/components/CollapsableText/CollapsableText.stories.js
@@ -35,8 +35,8 @@ export const ShorterThanMaxLength = () => (
 export const CustomComponents = () => (
   <div>
     <CollapsableText
-      moreLabel={<Icon name="plus-circle" className="text-success" />}
-      lessLabel={<Icon name="minus-circle" className="text-danger" />}
+      moreLabel={<Icon name="plus" className="text-success" />}
+      lessLabel={<Icon name="circle-minus" className="text-danger" />}
     >
       {loremIpsum}
     </CollapsableText>
diff --git a/src/components/HasManyFields/HasManyFieldsAdd.js b/src/components/HasManyFields/HasManyFieldsAdd.js
index d20788bd9..275e134db 100644
--- a/src/components/HasManyFields/HasManyFieldsAdd.js
+++ b/src/components/HasManyFields/HasManyFieldsAdd.js
@@ -9,7 +9,7 @@ const HasManyFieldsAdd = ({ children, className, ...props }) => {
 
   return (
     <Button color="success" block outline {...props} className={classes}>
-      <Icon name="plus-circle" className="me-2" />
+      <Icon name="plus" className="me-2" />
       <span>{children}</span>
     </Button>
   );
diff --git a/src/components/HasManyFields/HasManyFieldsAdd.spec.js b/src/components/HasManyFields/HasManyFieldsAdd.spec.js
index ba2451ae9..5cb2fa681 100644
--- a/src/components/HasManyFields/HasManyFieldsAdd.spec.js
+++ b/src/components/HasManyFields/HasManyFieldsAdd.spec.js
@@ -25,7 +25,7 @@ describe('<HasManyFieldsAdd />', () => {
 
   it('should have an icon', () => {
     const icon = component.find(Icon);
-    assert.equal(icon.prop('name'), 'plus-circle');
+    assert.equal(icon.prop('name'), 'plus');
   });
 
   it('should be a disabled button when disabled', () => {
diff --git a/src/components/HasManyFields/HasManyFieldsRow.tsx b/src/components/HasManyFields/HasManyFieldsRow.tsx
index c1337c1f7..06729526a 100644
--- a/src/components/HasManyFields/HasManyFieldsRow.tsx
+++ b/src/components/HasManyFields/HasManyFieldsRow.tsx
@@ -57,7 +57,7 @@ const HasManyFieldsRow = ({
       outline
       className="p-2 disabled align-self-stretch"
     >
-      <Icon name="times-circle-o" size="lg" />
+      <Icon name="circle-xmark" size="lg" />
     </Button>
   ) : (
     <ConfirmationButton
@@ -69,7 +69,7 @@ const HasManyFieldsRow = ({
       className="p-2 align-self-stretch"
       {...deleteProps}
     >
-      <Icon name="times-circle-o" size="lg" />
+      <Icon name="circle-xmark" size="lg" />
     </ConfirmationButton>
   );
 
diff --git a/src/components/HelpBubble/HelpBubble.spec.tsx b/src/components/HelpBubble/HelpBubble.spec.tsx
index 5647f42c8..1fd9c1d08 100644
--- a/src/components/HelpBubble/HelpBubble.spec.tsx
+++ b/src/components/HelpBubble/HelpBubble.spec.tsx
@@ -25,7 +25,7 @@ describe('<HelpBubble />', () => {
 
   it('should have a question mark', () => {
     const icon = mount(<HelpBubble title="hello" />, { attachTo: div }).find(Icon);
-    assert.equal(icon.prop('name'), 'question-circle');
+    assert.equal(icon.prop('name'), 'circle-question');
   });
 
   it('should link popover and icon trigger', () => {
diff --git a/src/components/HelpBubble/HelpBubble.tsx b/src/components/HelpBubble/HelpBubble.tsx
index f7f06dbf8..7f31cb599 100644
--- a/src/components/HelpBubble/HelpBubble.tsx
+++ b/src/components/HelpBubble/HelpBubble.tsx
@@ -41,7 +41,7 @@ function HelpBubble(props: HelpBubbleProps) {
   return (
     <span className={className} style={style}>
       <Button color="link" className="p-0" aria-label="More Info" onClick={toggle}>
-        <Icon name="question-circle" id={id} className="text-primary" />
+        <Icon name="circle-question" id={id} className="text-primary" />
       </Button>
       <Popover isOpen={isOpen} toggle={toggle} target={id} {...other}>
         <div aria-live="polite">
diff --git a/src/components/Icon/FontAwesomeAPM.tsx b/src/components/Icon/FontAwesomeAPM.tsx
index 1cb25663f..255d37858 100644
--- a/src/components/Icon/FontAwesomeAPM.tsx
+++ b/src/components/Icon/FontAwesomeAPM.tsx
@@ -28,7 +28,7 @@ export interface FontAwesomeAPMProps extends React.HTMLAttributes<any> {
   spin?: boolean;
   stack?: '1x' | '2x';
   tag?: keyof JSX.IntrinsicElements;
-  isSolid?: boolean;
+  iconStyle?: 'regular' | 'solid' | 'thin' | 'light' | 'duotone';
 }
 
 /**
@@ -68,7 +68,7 @@ export default class FontAwesomeAPM extends React.Component<FontAwesomeAPMProps>
       spin,
       stack,
       tag: Tag = 'i',
-      isSolid,
+      iconStyle,
       ariaLabel,
       ...props
     } = this.props;
@@ -100,8 +100,8 @@ export default class FontAwesomeAPM extends React.Component<FontAwesomeAPMProps>
       inverse && classNames.push('inverse');
 
       const fa = classNames.map((iconName) => `fa-${iconName}`);
-      isSolid? fa.unshift('fas') : fa.unshift('fa');
-
+      !iconStyle ? fa.unshift(`fa-solid`) : fa.unshift(`fa-${iconStyle}`);
+      
       classNames = fa;
     }
 
diff --git a/src/components/Icon/Icon.stories.js b/src/components/Icon/Icon.stories.js
index 86f0b9c10..4344218f5 100644
--- a/src/components/Icon/Icon.stories.js
+++ b/src/components/Icon/Icon.stories.js
@@ -20,7 +20,7 @@ export const LiveExample = () => (
     rotate={select('rotate', ['', '90', '180', '270'], '')}
     flip={select('flip', ['', 'horizontal', 'vertical'], '')}
     border={boolean('border', false)}
-    isSolid={boolean('isSolid', false)}
+    iconStyle={select('iconStyle', ['regular', 'solid', 'thin', 'light', 'duotone'], 'solid')}
   />
 );
 
@@ -49,7 +49,7 @@ export const InlineText = () => (
       <Icon name="print" /> Print
     </p>
     <p>
-      <Icon name="plus-circle" /> Add Item
+      <Icon name="plus" /> Add Item
     </p>
     <p>
       <Icon name="pencil" /> Edit
@@ -64,7 +64,7 @@ export const Buttons = () => (
   <div>
     <p>
       <Button>
-        <Icon name="plus-circle" fixedWidth /> Add Item
+        <Icon name="plus" fixedWidth /> Add Item
       </Button>
     </p>
     <p>
@@ -107,7 +107,7 @@ export const Size = () => (
 export const Animation = () => (
   <div>
     <Icon name="spinner" spin size="3x" />
-    <Icon name="circle-o-notch" spin size="3x" />
+    <Icon name="circle-notch" spin size="3x" />
     <Icon name="refresh" spin size="3x" />
     <Icon name="cog" spin size="3x" />
     <Icon name="spinner" pulse size="3x" />
diff --git a/src/components/Icon/icons.js b/src/components/Icon/icons.js
index a7e7c76dc..a4698157d 100644
--- a/src/components/Icon/icons.js
+++ b/src/components/Icon/icons.js
@@ -1,8 +1,7 @@
 export default [
+  'accessible-icon',
   'address-book',
-  'address-book-o',
   'address-card',
-  'address-card-o',
   'adjust',
   'adn',
   'align-justify',
@@ -22,23 +21,24 @@ export default [
   'angle-up',
   'apple',
   'archive',
-  'area-chart',
-  'arrow-circle-down',
-  'arrow-circle-left',
-  'arrow-circle-o-down',
-  'arrow-circle-o-left',
-  'arrow-circle-o-right',
-  'arrow-circle-o-up',
-  'arrow-circle-right',
-  'arrow-circle-up',
   'arrow-down',
+  'arrow-down-1-9',
+  'arrow-down-9-1',
+  'arrow-down-short-wide',
+  'arrow-down-wide-short',
+  'arrow-down-a-z',
+  'arrow-down-z-a',
   'arrow-left',
   'arrow-right',
+  'arrow-right-from-bracket',
+  'arrow-right-to-bracket',
+  'arrow-rotate-right',
   'arrow-up',
   'arrows',
-  'arrows-alt',
-  'arrows-h',
-  'arrows-v',
+  'arrows-left-right',
+  'arrows-rotate',
+  'arrows-up-down',
+  'arrow-up-right-from-square',
   'assistive-listening-systems',
   'asterisk',
   'at',
@@ -47,7 +47,6 @@ export default [
   'balance-scale',
   'ban',
   'bandcamp',
-  'bar-chart',
   'barcode',
   'bars',
   'bath',
@@ -61,9 +60,7 @@ export default [
   'behance',
   'behance-square',
   'bell',
-  'bell-o',
   'bell-slash',
-  'bell-slash-o',
   'bicycle',
   'binoculars',
   'birthday-cake',
@@ -78,34 +75,30 @@ export default [
   'bomb',
   'book',
   'bookmark',
-  'bookmark-o',
   'braille',
   'briefcase',
   'btc',
   'bug',
   'building',
-  'building-o',
   'bullhorn',
   'bullseye',
   'bus',
   'buysellads',
   'calculator',
   'calendar',
-  'calendar-check-o',
-  'calendar-minus-o',
-  'calendar-o',
-  'calendar-plus-o',
-  'calendar-times-o',
+  'calendar-minus',
+  'calendar-plus',
+  'calendar-xmark',
   'camera',
   'camera-retro',
   'car',
   'caret-down',
   'caret-left',
   'caret-right',
-  'caret-square-o-down',
-  'caret-square-o-left',
-  'caret-square-o-right',
-  'caret-square-o-up',
+  'caret-square-down',
+  'caret-square-left',
+  'caret-square-right',
+  'caret-square-up',
   'caret-up',
   'cart-arrow-down',
   'cart-plus',
@@ -119,12 +112,10 @@ export default [
   'cc-stripe',
   'cc-visa',
   'certificate',
-  'chain-broken',
+  'chart-area',
+  'chart-bar',
+  'chart-pie',
   'check',
-  'check-circle',
-  'check-circle-o',
-  'check-square',
-  'check-square-o',
   'chevron-circle-down',
   'chevron-circle-left',
   'chevron-circle-right',
@@ -136,15 +127,26 @@ export default [
   'child',
   'chrome',
   'circle',
-  'circle-o',
-  'circle-o-notch',
-  'circle-thin',
+  'circle-arrow-up',
+  'circle-check',
+  'circle-dot',
+  'circle-down',
+  'circle-left',
+  'circle-notch',
+  'circle-pause',
+  'circle-play',
+  'circle-question',
+  'circle-right',
+  'circle-up',
+  'circle-stop',
+  'circle-user',
+  'circle-xmark',
   'clipboard',
-  'clock-o',
+  'clock',
   'clone',
   'cloud',
-  'cloud-download',
-  'cloud-upload',
+  'cloud-arrow-down',
+  'cloud-arrow-up',
   'code',
   'code-fork',
   'codepen',
@@ -154,66 +156,57 @@ export default [
   'cogs',
   'columns',
   'comment',
-  'comment-o',
   'commenting',
-  'commenting-o',
   'comments',
-  'comments-o',
   'compass',
   'compress',
   'connectdevelop',
   'contao',
+  'copy',
   'copyright',
   'creative-commons',
   'credit-card',
-  'credit-card-alt',
   'crop',
   'crosshairs',
   'css3',
   'cube',
   'cubes',
-  'cutlery',
   'dashcube',
   'database',
   'deaf',
   'delicious',
   'desktop',
   'deviantart',
-  'diamond',
   'digg',
-  'dot-circle-o',
+  'dollar-sign',
+  'down-long',
   'download',
   'dribbble',
   'dropbox',
   'drupal',
   'edge',
-  'eercast',
   'eject',
   'ellipsis-h',
   'ellipsis-v',
   'empire',
   'envelope',
-  'envelope-o',
   'envelope-open',
-  'envelope-open-o',
   'envelope-square',
   'envira',
   'eraser',
   'etsy',
-  'eur',
-  'exchange',
+  'eur-sign',
   'exclamation',
-  'exclamation-circle',
-  'exclamation-triangle',
   'expand',
   'expeditedssl',
-  'external-link',
-  'external-link-square',
   'eye',
   'eye-slash',
-  'eyedropper',
+  'eye-dropper',
+  'face-frown',
+  'face-meh',
+  'face-smile',
   'facebook',
-  'facebook-official',
+  'facebook-f',
   'facebook-square',
   'fast-backward',
   'fast-forward',
@@ -221,19 +214,17 @@ export default [
   'female',
   'fighter-jet',
   'file',
-  'file-archive-o',
-  'file-audio-o',
-  'file-code-o',
-  'file-excel-o',
-  'file-image-o',
-  'file-o',
-  'file-pdf-o',
-  'file-powerpoint-o',
+  'file-zipper',
+  'file-audio',
+  'file-code',
+  'file-excel',
+  'file-image',
+  'file',
+  'file-pdf',
+  'file-powerpoint',
   'file-text',
-  'file-text-o',
-  'file-video-o',
-  'file-word-o',
-  'files-o',
+  'file-video',
+  'file-word',
   'film',
   'filter',
   'fire',
@@ -242,14 +233,11 @@ export default [
   'first-order',
   'flag',
   'flag-checkered',
-  'flag-o',
   'flask',
   'flickr',
-  'floppy-o',
+  'floppy-disk',
   'folder',
-  'folder-o',
   'folder-open',
-  'folder-open-o',
   'font',
   'font-awesome',
   'fonticons',
@@ -258,11 +246,12 @@ export default [
   'forward',
   'foursquare',
   'free-code-camp',
-  'frown-o',
-  'futbol-o',
+  'futbol',
   'gamepad',
+  'gauge',
   'gavel',
   'gbp',
+  'gem',
   'get-pocket',
   'gg',
   'gg-circle',
@@ -273,12 +262,12 @@ export default [
   'github-alt',
   'github-square',
   'gitlab',
-  'glass',
   'glide',
   'glide-g',
   'globe',
   'google',
   'google-plus',
+  'google-plus-g',
   'google-plus-official',
   'google-plus-square',
   'google-wallet',
@@ -288,91 +277,80 @@ export default [
   'grip-vertical',
   'h-square',
   'hacker-news',
-  'hand-lizard-o',
-  'hand-o-down',
-  'hand-o-left',
-  'hand-o-right',
-  'hand-o-up',
-  'hand-paper-o',
-  'hand-peace-o',
-  'hand-pointer-o',
-  'hand-rock-o',
-  'hand-scissors-o',
-  'hand-spock-o',
-  'handshake-o',
+  'hand',
+  'hand-lizard',
+  'hand-point-down',
+  'hand-point-left',
+  'hand-point-right',
+  'hand-point-up',
+  'hand-peace',
+  'hand-pointer',
+  'hand-back-fist',
+  'hand-scissors',
+  'hand-spock',
+  'handshake',
   'hashtag',
-  'hdd-o',
-  'header',
+  'hdd-druve',
+  'heading',
   'headphones',
   'heart',
-  'heart-o',
   'heartbeat',
   'history',
   'home',
-  'hospital-o',
+  'hospital',
   'hourglass',
   'hourglass-end',
   'hourglass-half',
-  'hourglass-o',
   'hourglass-start',
   'houzz',
   'html5',
   'i-cursor',
   'id-badge',
   'id-card',
-  'id-card-o',
-  'ils',
+  'image',
   'imdb',
   'inbox',
   'indent',
   'industry',
   'info',
-  'info-circle',
-  'inr',
   'instagram',
   'internet-explorer',
   'ioxhost',
   'italic',
   'joomla',
-  'jpy',
   'jsfiddle',
   'key',
-  'keyboard-o',
-  'krw',
+  'keyboard',
   'language',
   'laptop',
   'lastfm',
   'lastfm-square',
   'leaf',
   'leanpub',
-  'lemon-o',
-  'level-down',
-  'level-up',
+  'left-right',
+  'lemon',
   'life-ring',
-  'lightbulb-o',
+  'lightbulb',
   'line-chart',
   'link',
+  'link-slash',
   'linkedin',
-  'linkedin-square',
+  'linkedin-in',
   'linode',
   'linux',
+  'lira-sign',
   'list',
-  'list-alt',
   'list-ol',
   'list-ul',
   'location-arrow',
+  'location-dot',
   'lock',
-  'long-arrow-down',
-  'long-arrow-left',
-  'long-arrow-right',
-  'long-arrow-up',
   'low-vision',
   'magic',
   'magnet',
   'male',
   'map',
-  'map-marker',
-  'map-o',
+  'map',
   'map-pin',
   'map-signs',
   'mars',
@@ -380,30 +358,30 @@ export default [
   'mars-stroke',
   'mars-stroke-h',
   'mars-stroke-v',
+  'martini-glass-empty',
   'maxcdn',
-  'meanpath',
+  'maximize',
   'medium',
   'medkit',
   'meetup',
-  'meh-o',
   'mercury',
   'microchip',
   'microphone',
   'microphone-slash',
   'minus',
-  'minus-circle',
+  'circle-minus',
   'minus-square',
-  'minus-square-o',
   'mixcloud',
-  'mobile',
+  'mobile-screen-button',
   'modx',
-  'money',
-  'moon-o',
+  'money-bill-1',
+  'moon',
   'motorcycle',
   'mouse-pointer',
   'music',
   'neuter',
-  'newspaper-o',
+  'newspaper',
+  'note-sticky',
   'object-group',
   'object-ungroup',
   'odnoklassniki',
@@ -416,22 +394,19 @@ export default [
   'pagelines',
   'paint-brush',
   'paper-plane',
-  'paper-plane-o',
+  'paper-plane',
   'paperclip',
   'paragraph',
   'pause',
   'pause-circle',
-  'pause-circle-o',
   'paw',
   'paypal',
   'pencil',
-  'pencil-square',
-  'pencil-square-o',
+  'pen-to-square',
   'percent',
   'phone',
   'phone-square',
-  'picture-o',
-  'pie-chart',
+  'phone-volume	',
   'pied-piper',
   'pied-piper-alt',
   'pied-piper-pp',
@@ -441,12 +416,10 @@ export default [
   'plane',
   'play',
   'play-circle',
-  'play-circle-o',
   'plug',
   'plus',
   'plus-circle',
   'plus-square',
-  'plus-square-o',
   'podcast',
   'power-off',
   'print',
@@ -455,30 +428,31 @@ export default [
   'qq',
   'qrcode',
   'question',
-  'question-circle',
-  'question-circle-o',
   'quora',
   'quote-left',
   'quote-right',
   'random',
   'ravelry',
   'rebel',
+  'rectangle-list',
+  'rectangle-xmark',
   'recycle',
   'reddit',
   'reddit-alien',
   'reddit-square',
-  'refresh',
   'registered',
   'renren',
-  'repeat',
   'reply',
   'reply-all',
   'retweet',
+  'right-left',
+  'right-long',
   'road',
   'rocket',
   'rss',
   'rss-square',
-  'rub',
+  'rub-sign',
+  'rupee-sign',
   'safari',
   'scissors',
   'scribd',
@@ -486,13 +460,18 @@ export default [
   'search-minus',
   'search-plus',
   'sellsy',
+  'sellcast',
+  'square-minus',
+  'square-pen',
+  'square-plus',
   'server',
+  'shekel-sign',
   'share',
   'share-alt',
   'share-alt-square',
   'share-square',
-  'share-square-o',
-  'shield',
+  'share-from-square',
+  'shield-blank',
   'ship',
   'shirtsinbulk',
   'shopping-bag',
@@ -501,7 +480,6 @@ export default [
   'shower',
   'sign-in',
   'sign-language',
-  'sign-out',
   'signal',
   'simplybuilt',
   'sitemap',
@@ -510,43 +488,33 @@ export default [
   'slack',
   'sliders',
   'slideshare',
-  'smile-o',
   'snapchat',
-  'snapchat-ghost',
+  'snapchat',
   'snapchat-square',
-  'snowflake-o',
+  'snowflake',
   'sort',
   'sort-alpha-asc',
-  'sort-alpha-desc',
-  'sort-amount-asc',
-  'sort-amount-desc',
-  'sort-asc',
-  'sort-desc',
-  'sort-numeric-asc',
-  'sort-numeric-desc',
+  'sort-up',
+  'sort-down',
   'soundcloud',
   'space-shuttle',
   'spinner',
   'spoon',
   'spotify',
   'square',
-  'square-o',
+  'square-check',
   'stack-exchange',
   'stack-overflow',
   'star',
   'star-half',
-  'star-half-o',
-  'star-o',
   'steam',
   'steam-square',
   'step-backward',
   'step-forward',
   'stethoscope',
   'sticky-note',
-  'sticky-note-o',
   'stop',
   'stop-circle',
-  'stop-circle-o',
   'street-view',
   'strikethrough',
   'stumbleupon',
@@ -554,40 +522,35 @@ export default [
   'subscript',
   'subway',
   'suitcase',
-  'sun-o',
+  'sun',
   'superpowers',
   'superscript',
   'table',
-  'tablet',
-  'tachometer',
+  'table-cells-large',
+  'table-list',
+  'tablet-screen-button',
   'tag',
   'tags',
   'tasks',
   'taxi',
   'telegram',
-  'television',
+  'tv',
   'tencent-weibo',
   'terminal',
   'text-height',
   'text-width',
-  'th',
-  'th-large',
-  'th-list',
   'themeisle',
   'thermometer-empty',
   'thermometer-full',
   'thermometer-half',
   'thermometer-quarter',
   'thermometer-three-quarters',
-  'thumb-tack',
+  'thumbtack',
   'thumbs-down',
-  'thumbs-o-down',
-  'thumbs-o-up',
   'thumbs-up',
-  'ticket',
+  'ticket-simple',
   'times',
   'times-circle',
-  'times-circle-o',
   'tint',
   'toggle-off',
   'toggle-on',
@@ -595,17 +558,18 @@ export default [
   'train',
   'transgender',
   'transgender-alt',
-  'trash',
-  'trash-o',
+  'trash-can',
   'tree',
   'trello',
+  'triangle-exclamation',
   'tripadvisor',
   'trophy',
   'truck',
-  'try',
   'tty',
   'tumblr',
   'tumblr-square',
+  'turn-down',
+  'turn-up',
   'twitch',
   'twitter',
   'twitter-square',
@@ -616,30 +580,30 @@ export default [
   'university',
   'unlock',
   'unlock-alt',
+  'up-down',
+  'up-long',
+  'up-right-from-square',
   'upload',
   'usb',
-  'usd',
   'user',
   'user-circle',
-  'user-circle-o',
   'user-md',
-  'user-o',
   'user-plus',
   'user-secret',
   'user-times',
+  'user-headset',
   'users',
+  'utensils',
   'venus',
   'venus-double',
   'venus-mars',
   'viacoin',
   'viadeo',
   'viadeo-square',
-  'video-camera',
-  'vimeo',
+  'vimeo-v',
   'vimeo-square',
   'vine',
   'vk',
-  'volume-control-phone',
   'volume-down',
   'volume-off',
   'volume-up',
@@ -647,16 +611,15 @@ export default [
   'weixin',
   'whatsapp',
   'wheelchair',
-  'wheelchair-alt',
   'wifi',
   'wikipedia-w',
   'window-close',
-  'window-close-o',
   'window-maximize',
   'window-minimize',
   'window-restore',
   'windows',
   'wordpress',
+  'won-sign',
   'wpbeginner',
   'wpexplorer',
   'wpforms',
@@ -666,8 +629,8 @@ export default [
   'y-combinator',
   'yahoo',
   'yelp',
+  'yen-sign',
   'yoast',
   'youtube',
-  'youtube-play',
   'youtube-square',
 ];
diff --git a/src/components/Input/MonthInput.js b/src/components/Input/MonthInput.js
index 29501b907..efd16cb87 100644
--- a/src/components/Input/MonthInput.js
+++ b/src/components/Input/MonthInput.js
@@ -291,7 +291,7 @@ export default class MonthInput extends React.Component {
                 type="button"
                 tabIndex={-1}
               >
-                <Icon name="calendar-o" fixedWidth />
+                <Icon name="calendar" fixedWidth />
                 <span className="visually-hidden">Open Calendar</span>
               </Button>
             </InputGroup>
diff --git a/src/components/Input/TimeInput.js b/src/components/Input/TimeInput.js
index f42e9bf69..c37311864 100644
--- a/src/components/Input/TimeInput.js
+++ b/src/components/Input/TimeInput.js
@@ -76,7 +76,7 @@ function userInputProgress(input, time) {
   return [!!hasTypedTens, !!hasTypedMin];
 }
 
-const ClockIcon = () => <Icon name="clock-o" />;
+const ClockIcon = () => <Icon name="clock" />;
 
 export default class TimeInput extends React.Component {
   static propTypes = {
diff --git a/src/components/Status/Status.spec.tsx b/src/components/Status/Status.spec.tsx
index df9826b1a..f0808a0a6 100644
--- a/src/components/Status/Status.spec.tsx
+++ b/src/components/Status/Status.spec.tsx
@@ -12,7 +12,7 @@ describe('<Status />', () => {
 
   it('should take a type option', () => {
     const icon = shallow(<Status type="info" />).find(Icon);
-    assert.strictEqual(icon.prop('name'), 'info-circle');
+    assert.strictEqual(icon.prop('name'), 'info');
     assert.strictEqual(icon.prop('className'), 'text-info');
   });
 
diff --git a/src/components/Status/Status.tsx b/src/components/Status/Status.tsx
index 5592dcc1e..d9ee0c2c3 100644
--- a/src/components/Status/Status.tsx
+++ b/src/components/Status/Status.tsx
@@ -12,19 +12,19 @@ const Status = ({ type = 'none', className, ...props }: StatusProps) => {
   let name = '';
   switch (type) {
     case 'info':
-      name = 'info-circle';
+      name = 'circle-info';
       break;
     case 'muted':
-      name = 'circle-thin';
+      name = 'circle';
       break;
     case 'success':
-      name = 'check-circle';
+      name = 'circle-check';
       break;
     case 'danger':
       name = 'warning';
       break;
     case 'warning':
-      name = 'exclamation-circle';
+      name = 'circle-exclamation';
       break;
     case 'none':
       name = 'circle';
diff --git a/src/components/Waiting/Waiting.stories.js b/src/components/Waiting/Waiting.stories.js
index fa01022e7..699fb7e87 100644
--- a/src/components/Waiting/Waiting.stories.js
+++ b/src/components/Waiting/Waiting.stories.js
@@ -22,6 +22,6 @@ export const CustomTitle = () => (
 
 export const Children = () => (
   <Waiting isOpen={boolean('isOpen', true)} backdrop={boolean('backdrop', true)}>
-    <Icon name="clock-o" size="4x" />
+    <Icon name="clock" size="4x" />
   </Waiting>
 );