diff --git a/docs/lib/Components/InputGroupPage.js b/docs/lib/Components/InputGroupPage.js
index 794e32866..1206b66f5 100644
--- a/docs/lib/Components/InputGroupPage.js
+++ b/docs/lib/Components/InputGroupPage.js
@@ -51,12 +51,6 @@ export default class InputGroupPage extends React.Component {
   className: PropTypes.string
 };
 
-InputGroupAddOn.propTypes = {
-  tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
-  addonType: PropTypes.oneOf(['prepend', 'append']).isRequired,
-  className: PropTypes.string
-};
-
 InputGroupButton.propTypes = {
   tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
   addonType: PropTypes.oneOf(['prepend', 'append']).isRequired,
@@ -79,7 +73,7 @@ InputGroupButton.propTypes = {
           </PrismCode>
         </pre>
 
-        <SectionTitle>Addon Sizing</SectionTitle>
+        <SectionTitle>Input Group Sizing</SectionTitle>
         <div className="docs-example">
           <div>
             <AddonSizingExample />
diff --git a/docs/lib/examples/InputGroupAddon.js b/docs/lib/examples/InputGroupAddon.js
index 9199934b5..da5c3345b 100644
--- a/docs/lib/examples/InputGroupAddon.js
+++ b/docs/lib/examples/InputGroupAddon.js
@@ -1,31 +1,23 @@
 import React from 'react';
-import { InputGroup, InputGroupText, InputGroupAddon, Input } from 'reactstrap';
+import { InputGroup, InputGroupText, Input } from 'reactstrap';
 
 const Example = (props) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>To the Left!</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>To the Left!</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="append">
-          <InputGroupText>To the Right!</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>To the Right!</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>To the Left!</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>To the Left!</InputGroupText>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">
-          <InputGroupText>To the Right!</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>To the Right!</InputGroupText>
       </InputGroup>
     </div>
   );
diff --git a/docs/lib/examples/InputGroupButton.js b/docs/lib/examples/InputGroupButton.js
index 2706f2355..13d42864b 100644
--- a/docs/lib/examples/InputGroupButton.js
+++ b/docs/lib/examples/InputGroupButton.js
@@ -1,8 +1,7 @@
 import React, { useState } from 'react';
 import {
   InputGroup,
-  InputGroupAddon,
-  InputGroupButtonDropdown,
+  Dropdown,
   Input,
   Button,
   DropdownToggle,
@@ -21,13 +20,13 @@ const Example = (props) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend"><Button>I'm a button</Button></InputGroupAddon>
+        <Button>I'm a button</Button>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupButtonDropdown addonType="append" isOpen={dropdownOpen} toggle={toggleDropDown}>
+        <Dropdown isOpen={dropdownOpen} toggle={toggleDropDown}>
           <DropdownToggle caret>
             Button Dropdown
           </DropdownToggle>
@@ -38,11 +37,11 @@ const Example = (props) => {
             <DropdownItem divider />
             <DropdownItem>Another Action</DropdownItem>
           </DropdownMenu>
-        </InputGroupButtonDropdown>
+        </Dropdown>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupButtonDropdown addonType="prepend" isOpen={splitButtonOpen} toggle={toggleSplit}>
+        <Dropdown isOpen={splitButtonOpen} toggle={toggleSplit}>
           <Button outline>Split Button</Button>
           <DropdownToggle split outline />
           <DropdownMenu>
@@ -52,9 +51,9 @@ const Example = (props) => {
             <DropdownItem divider />
             <DropdownItem>Another Action</DropdownItem>
           </DropdownMenu>
-        </InputGroupButtonDropdown>
+        </Dropdown>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append"><Button color="secondary">I'm a button</Button></InputGroupAddon>
+        <Button color="secondary">I'm a button</Button>
       </InputGroup>
     </div>
   );
diff --git a/docs/lib/examples/InputGroupButtonShorthand.js b/docs/lib/examples/InputGroupButtonShorthand.js
index 2d935da09..742fa171b 100644
--- a/docs/lib/examples/InputGroupButtonShorthand.js
+++ b/docs/lib/examples/InputGroupButtonShorthand.js
@@ -1,31 +1,23 @@
 import React from 'react';
-import { InputGroup, InputGroupAddon, Button, Input } from 'reactstrap';
+import { InputGroup, Button, Input } from 'reactstrap';
 
 const Example = (props) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <Button>To the Left!</Button>
-        </InputGroupAddon>
+        <Button>To the Left!</Button>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="append">
-          <Button color="secondary">To the Right!</Button>
-        </InputGroupAddon>
+        <Button color="secondary">To the Right!</Button>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <Button color="danger">To the Left!</Button>
-        </InputGroupAddon>
+        <Button color="danger">To the Left!</Button>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">
-          <Button color="success">To the Right!</Button>
-        </InputGroupAddon>
+        <Button color="success">To the Right!</Button>
       </InputGroup>
     </div>
   );
diff --git a/docs/lib/examples/InputGroupOverview.js b/docs/lib/examples/InputGroupOverview.js
index f16d4dd7b..39d0f7c37 100644
--- a/docs/lib/examples/InputGroupOverview.js
+++ b/docs/lib/examples/InputGroupOverview.js
@@ -1,48 +1,38 @@
 import React from 'react';
-import { InputGroup, InputGroupAddon, InputGroupText, Input } from 'reactstrap';
+import { InputGroup, InputGroupText, Input } from 'reactstrap';
 
 const Example = (props) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>@</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>@</InputGroupText>
         <Input placeholder="username" />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>
-            <Input addon type="checkbox" aria-label="Checkbox for following text input" />
-          </InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>
+          <Input addon type="checkbox" aria-label="Checkbox for following text input" />
+        </InputGroupText>
         <Input placeholder="Check it out" />
       </InputGroup>
       <br />
       <InputGroup>
         <Input placeholder="username" />
-        <InputGroupAddon addonType="append">
-          <InputGroupText>@example.com</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>@example.com</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>$</InputGroupText>
-          <InputGroupText>$</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
+        <InputGroupText>$</InputGroupText>
         <Input placeholder="Dolla dolla billz yo!" />
-        <InputGroupAddon addonType="append">
-          <InputGroupText>$</InputGroupText>
-          <InputGroupText>$</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
+        <InputGroupText>$</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">$</InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
         <Input placeholder="Amount" min={0} max={100} type="number" step="1" />
-        <InputGroupAddon addonType="append">.00</InputGroupAddon>
+        <InputGroupText>.00</InputGroupText>
       </InputGroup>
     </div>
   );
diff --git a/docs/lib/examples/InputGroupSizing.js b/docs/lib/examples/InputGroupSizing.js
index 1f7522119..57a857689 100644
--- a/docs/lib/examples/InputGroupSizing.js
+++ b/docs/lib/examples/InputGroupSizing.js
@@ -1,21 +1,21 @@
 import React from 'react';
-import { InputGroup, InputGroupAddon, Input } from 'reactstrap';
+import { InputGroup, InputGroupText, Input } from 'reactstrap';
 
 const Example = (props) => {
   return (
     <div>
       <InputGroup size="lg">
-        <InputGroupAddon addonType="prepend">@lg</InputGroupAddon>
+        <InputGroupText>@lg</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">@normal</InputGroupAddon>
+        <InputGroupText>@normal</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup size="sm">
-        <InputGroupAddon addonType="prepend">@sm</InputGroupAddon>
+        <InputGroupText>@sm</InputGroupText>
         <Input />
       </InputGroup>
     </div>
diff --git a/src/Dropdown.js b/src/Dropdown.js
index 7ae01117f..4ff39dc37 100644
--- a/src/Dropdown.js
+++ b/src/Dropdown.js
@@ -16,7 +16,6 @@ const propTypes = {
   isOpen: PropTypes.bool,
   nav: PropTypes.bool,
   active: PropTypes.bool,
-  addonType: PropTypes.oneOfType([PropTypes.bool, PropTypes.oneOf(['prepend', 'append'])]),
   size: PropTypes.string,
   tag: tagPropType,
   toggle: PropTypes.func,
@@ -34,7 +33,6 @@ const defaultProps = {
   direction: 'down',
   nav: false,
   active: false,
-  addonType: false,
   inNavbar: false,
   setActiveFromChild: false
 };
@@ -252,7 +250,6 @@ class Dropdown extends React.Component {
       nav,
       setActiveFromChild,
       active,
-      addonType,
       tag,
       menuRole,
       ...attrs
@@ -275,10 +272,9 @@ class Dropdown extends React.Component {
       nav && active ? 'active' : false,
       setActiveFromChild && subItemIsActive ? 'active' : false,
       {
-        [`input-group-${addonType}`]: addonType,
         'btn-group': group,
         [`btn-group-${size}`]: !!size,
-        dropdown: !group && !addonType,
+        dropdown: !group,
         show: isOpen,
         'nav-item': nav
       }
diff --git a/src/InputGroupAddon.js b/src/InputGroupAddon.js
deleted file mode 100644
index 19767e87a..000000000
--- a/src/InputGroupAddon.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import { mapToCssModules, tagPropType } from './utils';
-import InputGroupText from './InputGroupText';
-
-const propTypes = {
-  tag: tagPropType,
-  addonType: PropTypes.oneOf(['prepend', 'append']).isRequired,
-  children: PropTypes.node,
-  className: PropTypes.string,
-  cssModule: PropTypes.object,
-};
-
-const defaultProps = {
-  tag: 'div'
-};
-
-const InputGroupAddon = (props) => {
-  const {
-    className,
-    cssModule,
-    tag: Tag,
-    addonType,
-    children,
-    ...attributes
-  } = props;
-
-  const classes = mapToCssModules(classNames(
-    className,
-    'input-group-' + addonType
-  ), cssModule);
-
-  // Convenience to assist with transition
-  if (typeof children === 'string') {
-    return (
-      <Tag {...attributes} className={classes}>
-        <InputGroupText children={children} />
-      </Tag>
-    );
-  }
-
-  return (
-    <Tag {...attributes} className={classes} children={children} />
-  );
-};
-
-InputGroupAddon.propTypes = propTypes;
-InputGroupAddon.defaultProps = defaultProps;
-
-export default InputGroupAddon;
diff --git a/src/__tests__/InputGroupAddon.spec.js b/src/__tests__/InputGroupAddon.spec.js
deleted file mode 100644
index 2f0e86d55..000000000
--- a/src/__tests__/InputGroupAddon.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import { InputGroupAddon, InputGroupText } from '../';
-
-describe('InputGroupAddon', () => {
-  it('should render with "div" tag', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append">Yo!</InputGroupAddon>);
-
-    expect(wrapper.type()).toBe('div');
-  });
-
-  it('should render children', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append">Yo!</InputGroupAddon>);
-
-    expect(wrapper.text()).toBe('<InputGroupText />');
-  });
-
-  it('should render children provided', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append"><button>Yo!</button></InputGroupAddon>);
-
-    expect(wrapper.childAt(0).type()).toBe('button');
-  });
-
-  it('should render the string provided in the child InputGroupText', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append">Yo!</InputGroupAddon>);
-
-    expect(wrapper.childAt(0).type()).toBe(InputGroupText);
-    expect(wrapper.childAt(0).prop('children')).toBe('Yo!');
-  });
-
-  it('should render with "input-group-*" classes', () => {
-    const wrapperPrepend = shallow(<InputGroupAddon addonType="prepend">Yo!</InputGroupAddon>);
-    const wrapperAppend = shallow(<InputGroupAddon addonType="append">Yo!</InputGroupAddon>);
-
-    expect(wrapperPrepend.hasClass('input-group-prepend')).toBe(true);
-    expect(wrapperAppend.hasClass('input-group-append')).toBe(true);
-  });
-
-  it('should render additional classes', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append" className="other">Yo!</InputGroupAddon>);
-
-    expect(wrapper.hasClass('other')).toBe(true);
-    expect(wrapper.hasClass('input-group-append')).toBe(true);
-  });
-
-  it('should render custom tag', () => {
-    const wrapper = shallow(<InputGroupAddon addonType="append" tag="main">Yo!</InputGroupAddon>);
-
-    expect(wrapper.type()).toBe('main');
-  });
-});
diff --git a/src/index.js b/src/index.js
index b1b9db4b9..3ddce3224 100644
--- a/src/index.js
+++ b/src/index.js
@@ -63,7 +63,6 @@ export FormGroup from './FormGroup';
 export FormText from './FormText';
 export Input from './Input';
 export InputGroup from './InputGroup';
-export InputGroupAddon from './InputGroupAddon';
 export InputGroupButtonDropdown from './InputGroupButtonDropdown';
 export InputGroupText from './InputGroupText';
 export Label from './Label';
diff --git a/types/index.d.ts b/types/index.d.ts
index 5c5c680dd..d12420a32 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -82,8 +82,6 @@ export { default as Input } from './lib/Input';
 export { InputProps } from './lib/Input';
 export { default as InputGroup } from './lib/InputGroup';
 export { InputGroupProps } from './lib/InputGroup';
-export { default as InputGroupAddon } from './lib/InputGroupAddon';
-export { InputGroupAddonProps } from './lib/InputGroupAddon';
 export { default as InputGroupButtonDropdown } from './lib/InputGroupButtonDropdown';
 export { InputGroupButtonDropdownProps } from './lib/InputGroupButtonDropdown';
 export { default as InputGroupText } from './lib/InputGroupText';
diff --git a/types/lib/InputGroupAddon.d.ts b/types/lib/InputGroupAddon.d.ts
deleted file mode 100644
index 1af263492..000000000
--- a/types/lib/InputGroupAddon.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react';
-import { CSSModule } from './index';
-
-export interface InputGroupAddonProps
-  extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ElementType;
-  cssModule?: CSSModule;
-  addonType: 'prepend' | 'append';
-}
-
-declare class InputGroupAddon extends React.Component<InputGroupAddonProps> {}
-export default InputGroupAddon;
diff --git a/types/lib/index.d.ts b/types/lib/index.d.ts
index c795adbaa..6a345268d 100644
--- a/types/lib/index.d.ts
+++ b/types/lib/index.d.ts
@@ -86,8 +86,6 @@ export { default as Input } from './Input';
 export { InputProps } from './Input';
 export { default as InputGroup } from './InputGroup';
 export { InputGroupProps } from './InputGroup';
-export { default as InputGroupAddon } from './InputGroupAddon';
-export { InputGroupAddonProps } from './InputGroupAddon';
 export { default as InputGroupButtonDropdown } from './InputGroupButtonDropdown';
 export { InputGroupButtonDropdownProps } from './InputGroupButtonDropdown';
 export { default as InputGroupText } from './InputGroupText';
diff --git a/types/reactstrap-tests.tsx b/types/reactstrap-tests.tsx
index 415592c9d..3a7c69854 100644
--- a/types/reactstrap-tests.tsx
+++ b/types/reactstrap-tests.tsx
@@ -44,7 +44,6 @@ import {
   FormText,
   Input,
   InputGroup,
-  InputGroupAddon,
   InputGroupButtonDropdown,
   InputGroupText,
   Pagination,
@@ -1897,42 +1896,38 @@ const Example52 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">@</InputGroupAddon>
+        <InputGroupText>@</InputGroupText>
         <Input placeholder="username" />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
+        <InputGroupText>
           <Input
             addon
             type="checkbox"
             aria-label="Checkbox for following text input"
           />
-        </InputGroupAddon>
+        </InputGroupText>
         <Input placeholder="Check it out" />
       </InputGroup>
       <br />
       <InputGroup>
         <Input placeholder="username" />
-        <InputGroupAddon addonType="prepend">@example.com</InputGroupAddon>
+        <InputGroupText>@example.com</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <InputGroupText>$</InputGroupText>
-          <InputGroupText>$</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
+        <InputGroupText>$</InputGroupText>
         <Input placeholder="Dolla dolla billz yo!" />
-        <InputGroupAddon addonType="append">
-          <InputGroupText>$</InputGroupText>
-          <InputGroupText>$</InputGroupText>
-        </InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
+        <InputGroupText>$</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">$</InputGroupAddon>
+        <InputGroupText>$</InputGroupText>
         <Input placeholder="Amount" type="number" step="1" />
-        <InputGroupAddon addonType="append">.00</InputGroupAddon>
+        <InputGroupText>.00</InputGroupText>
       </InputGroup>
     </div>
   );
@@ -1942,19 +1937,19 @@ const Example53 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
+        <InputGroupText>To the Left!</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="append">To the Right!</InputGroupAddon>
+        <InputGroupText>To the Right!</InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
+        <InputGroupText>To the Left!</InputGroupText>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">To the Right!</InputGroupAddon>
+        <InputGroupText>To the Right!</InputGroupText>
       </InputGroup>
     </div>
   );
@@ -1964,17 +1959,17 @@ const Example54 = (props: any) => {
   return (
     <div>
       <InputGroup size="lg">
-        <InputGroupAddon addonType="prepend">@lg</InputGroupAddon>
+        <InputGroupText>@lg</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">@normal</InputGroupAddon>
+        <InputGroupText>@normal</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup size="sm">
-        <InputGroupAddon addonType="prepend">@sm</InputGroupAddon>
+        <InputGroupText>@sm</InputGroupText>
         <Input />
       </InputGroup>
     </div>
@@ -1985,23 +1980,17 @@ const Example55 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <Button>I'm a button</Button>
-        </InputGroupAddon>
+        <Button>I'm a button</Button>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="append"></InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend"></InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">
-          <Button color="secondary">I'm a button</Button>
-        </InputGroupAddon>
+        <Button color="secondary">I'm a button</Button>
       </InputGroup>
     </div>
   );
@@ -2011,17 +2000,17 @@ const Example56 = (props: any) => {
   return (
     <div>
       <InputGroup size="lg">
-        <InputGroupAddon addonType="prepend">@lg</InputGroupAddon>
+        <InputGroupText>@lg</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend">@normal</InputGroupAddon>
+        <InputGroupText>@normal</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup size="sm">
-        <InputGroupAddon addonType="prepend">@sm</InputGroupAddon>
+        <InputGroupText>@sm</InputGroupText>
         <Input />
       </InputGroup>
     </div>
@@ -2032,23 +2021,17 @@ const Example57 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <Button>I'm a button</Button>
-        </InputGroupAddon>
+        <Button>I'm a button</Button>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="prepend"></InputGroupAddon>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend"></InputGroupAddon>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">
-          <Button color="secondary">I'm a button</Button>
-        </InputGroupAddon>
+        <Button color="secondary">I'm a button</Button>
       </InputGroup>
     </div>
   );
@@ -2058,25 +2041,25 @@ const Example58 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">To the Left!</InputGroupAddon>
+        <InputGroupText>To the Left!</InputGroupText>
         <Input />
       </InputGroup>
       <br />
       <InputGroup>
         <Input />
-        <InputGroupAddon addonType="append" color="secondary">
+        <InputGroupText color="secondary">
           To the Right!
-        </InputGroupAddon>
+        </InputGroupText>
       </InputGroup>
       <br />
       <InputGroup>
-        <InputGroupAddon addonType="prepend" color="danger">
+        <InputGroupText color="danger">
           To the Left!
-        </InputGroupAddon>
+        </InputGroupText>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append" color="success">
+        <InputGroupText color="success">
           To the Right!
-        </InputGroupAddon>
+        </InputGroupText>
       </InputGroup>
     </div>
   );
@@ -4731,9 +4714,7 @@ const Example116 = (props: any) => {
   return (
     <div>
       <InputGroup>
-        <InputGroupAddon addonType="prepend">
-          <Button>I'm a button</Button>
-        </InputGroupAddon>
+        <Button>I'm a button</Button>
         <Input />
       </InputGroup>
       <br />
@@ -4764,9 +4745,7 @@ const Example116 = (props: any) => {
           </DropdownMenu>
         </InputGroupButtonDropdown>
         <Input placeholder="and..." />
-        <InputGroupAddon addonType="append">
-          <Button color="secondary">I'm a button</Button>
-        </InputGroupAddon>
+        <Button color="secondary">I'm a button</Button>
       </InputGroup>
     </div>
   );
@@ -4849,7 +4828,6 @@ import { default as FormGroup_ } from './lib/FormGroup'; /* tslint:disable-line:
 import { default as FormText_ } from './lib/FormText'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as Input_ } from './lib/Input'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as InputGroup_ } from './lib/InputGroup'; /* tslint:disable-line: no-relative-import-in-test */
-import { default as InputGroupAddon_ } from './lib/InputGroupAddon'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as InputGroupButtonDropdown_ } from './lib/InputGroupButtonDropdown'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as InputGroupText_ } from './lib/InputGroupText'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as Label_ } from './lib/Label'; /* tslint:disable-line: no-relative-import-in-test */
@@ -4951,12 +4929,6 @@ function AnyPropExample() {
       <FormText_ foo={1} bar={false} foobar="example" />
       <Input_ foo={1} bar={false} foobar="example" />
       <InputGroup_ foo={1} bar={false} foobar="example" />
-      <InputGroupAddon_
-        foo={1}
-        bar={false}
-        foobar="example"
-        addonType="prepend"
-      />
       <InputGroupButtonDropdown_
         foo={1}
         bar={false}
@@ -5711,11 +5683,6 @@ const MegaTest = () => {
       <Input innerRef={React.createRef<HTMLTextAreaElement>()} />
       <Input innerRef={React.createRef<HTMLInputElement>()} />
       <InputGroup ref={React.createRef<InputGroup>()} {...htmlProps} />
-      <InputGroupAddon
-        ref={React.createRef<InputGroupAddon>()}
-        {...htmlProps}
-        addonType="append"
-      />
       <InputGroupText ref={React.createRef<InputGroupText>()} {...htmlProps} />
       <Label ref={React.createRef<Label>()} {...htmlProps} />
       <ListGroup ref={React.createRef<ListGroup>()} {...htmlProps} />