diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
index f917021e9f..72d2d0d652 100644
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -76,6 +76,7 @@ export interface ModalProps {
   keyboard?: boolean;
   wrapProps?: any;
   prefixCls?: string;
+  closeIcon?: React.ReactNode;
 }
 
 type getContainerFunc = () => HTMLElement;
@@ -164,6 +165,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
     footer: PropTypes.node,
     title: PropTypes.node,
     closable: PropTypes.bool,
+    closeIcon: PropTypes.node,
   };
 
   handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -210,6 +212,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
       wrapClassName,
       centered,
       getContainer,
+      closeIcon,
       ...restProps
     } = this.props;
 
@@ -220,7 +223,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
       </LocaleReceiver>
     );
 
-    const closeIcon = (
+    const closeIconToRender = closeIcon || (
       <span className={`${prefixCls}-close-x`}>
         <Icon className={`${prefixCls}-close-icon`} type="close" />
       </span>
@@ -236,7 +239,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
         visible={visible}
         mousePosition={mousePosition}
         onClose={this.handleCancel}
-        closeIcon={closeIcon}
+        closeIcon={closeIconToRender}
       />
     );
   };
diff --git a/components/modal/__tests__/Modal.test.js b/components/modal/__tests__/Modal.test.js
index e7e7476879..c96379deec 100644
--- a/components/modal/__tests__/Modal.test.js
+++ b/components/modal/__tests__/Modal.test.js
@@ -57,4 +57,9 @@ describe('Modal', () => {
     wrapper.handleOk();
     expect(onOk).toHaveBeenCalled();
   });
+
+  it('support closeIcon', () => {
+    const wrapper = mount(<Modal closeIcon={<a>closeIcon</a>} visible />);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
 });
diff --git a/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/components/modal/__tests__/__snapshots__/Modal.test.js.snap
index 1a2016c324..1f95fed6bd 100644
--- a/components/modal/__tests__/__snapshots__/Modal.test.js.snap
+++ b/components/modal/__tests__/__snapshots__/Modal.test.js.snap
@@ -169,3 +169,71 @@ exports[`Modal render without footer 1`] = `
   </div>
 </div>
 `;
+
+exports[`Modal support closeIcon 1`] = `
+<div>
+  <div
+    class="ant-modal-mask fade-appear"
+  />
+  <div
+    class="ant-modal-wrap "
+    role="dialog"
+    tabindex="-1"
+  >
+    <div
+      class="ant-modal zoom-appear"
+      role="document"
+      style="width: 520px;"
+    >
+      <div
+        aria-hidden="true"
+        style="width: 0px; height: 0px; overflow: hidden;"
+        tabindex="0"
+      />
+      <div
+        class="ant-modal-content"
+      >
+        <button
+          aria-label="Close"
+          class="ant-modal-close"
+          type="button"
+        >
+          <a>
+            closeIcon
+          </a>
+        </button>
+        <div
+          class="ant-modal-body"
+        />
+        <div
+          class="ant-modal-footer"
+        >
+          <div>
+            <button
+              class="ant-btn"
+              type="button"
+            >
+              <span>
+                Cancel
+              </span>
+            </button>
+            <button
+              class="ant-btn ant-btn-primary"
+              type="button"
+            >
+              <span>
+                OK
+              </span>
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        ari