diff --git a/src/Chip/ChipIcon.tsx b/src/Chip/ChipIcon.tsx
index af487eb86f..8ef97ef1ee 100644
--- a/src/Chip/ChipIcon.tsx
+++ b/src/Chip/ChipIcon.tsx
@@ -7,9 +7,7 @@ import { STYLE_VARIANTS } from './constants';
 export type ChipIconProps = {
   className: string,
   src: React.ComponentType,
-  onClick?: KeyboardEventHandler & MouseEventHandler,
-  alt?: string,
-  variant: string,
+  variant: typeof STYLE_VARIANTS[keyof typeof STYLE_VARIANTS],
   disabled?: boolean,
 } & (
   // Either _both_ onClick and alt are provided, or neither is:
diff --git a/src/IconButton/__snapshots__/IconButton.test.tsx.snap b/src/IconButton/__snapshots__/IconButton.test.tsx.snap
index 58429cad8c..dd82977c10 100644
--- a/src/IconButton/__snapshots__/IconButton.test.tsx.snap
+++ b/src/IconButton/__snapshots__/IconButton.test.tsx.snap
@@ -47,11 +47,33 @@ exports[`<IconButton /> renders with deprecated props 1`] = `
   <span
     className="btn-icon__icon-container"
   >
-    <span
-      aria-hidden={true}
-      className="btn-icon__icon"
-      id="Icon1"
-    />
+    <svg
+      aria-hidden="true"
+      className="svg-inline--fa fa-InfoOutlineIcon btn-icon__icon"
+      data-icon="InfoOutlineIcon"
+      data-prefix="pgn"
+      focusable="false"
+      role="img"
+      style={{}}
+      viewBox="0 0 function SvgInfoOutline(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: 24,
+    height: 24,
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    d: "M11 7h2v2h-2V7Zm0 4h2v6h-2v-6Zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2Zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8Z",
+    fill: "currentColor"
+  }));
+} undefined"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fill="currentColor"
+        style={{}}
+      />
+    </svg>
   </span>
 </button>
 `;
diff --git a/src/IconButton/index.tsx b/src/IconButton/index.tsx
index 5e38e1b35f..601479cd0e 100644
--- a/src/IconButton/index.tsx
+++ b/src/IconButton/index.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { type Placement } from 'react-bootstrap/Overlay';
-import Icon from '../Icon';
 import { OverlayTrigger } from '../Overlay';
 import Tooltip from '../Tooltip';
+import Icon from '../Icon';
 
 interface Props extends React.HTMLAttributes<HTMLButtonElement> {
   iconAs?: React.ComponentType<any>,