diff --git a/components/button/demo/icon.md b/components/button/demo/icon.md
index 2c46d0764c..fa3489d5e7 100644
--- a/components/button/demo/icon.md
+++ b/components/button/demo/icon.md
@@ -24,9 +24,13 @@ ReactDOM.render(
   <div>
     <Button type="primary" shape="circle" icon="search" />
     <Button type="primary" icon="search">Search</Button>
+    <Button shape="circle" icon="search" />
+    <Button icon="search">Search</Button>
     <br />
-    <Button type="ghost" shape="circle-outline" icon="search" />
+    <Button type="ghost" shape="circle" icon="search" />
     <Button type="ghost" icon="search">Search</Button>
+    <Button type="dashed" shape="circle" icon="search" />
+    <Button type="dashed" icon="search">Search</Button>
   </div>,
   mountNode
 );
diff --git a/components/button/index.en-US.md b/components/button/index.en-US.md
index 38f2026d31..5f8d6f518d 100644
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -19,7 +19,7 @@ Property | Description | Type | Default
 type | can be set to `primary` `ghost` `dashed` or omitted | string | -
 htmlType | to set the original `type` of `button`, see: [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
 icon | set the icon of button, see: Icon component | string | -
-shape | can be set to `circle` `circle-outline` or omitted | string | -
+shape | can be set to `circle` or omitted | string | -
 size | can be set to `small` `large` or omitted | string | `default`
 loading | to set the loading status of button | boolean | false
 onClick | set the handler to handle `click` event | function | -
diff --git a/components/button/index.zh-CN.md b/components/button/index.zh-CN.md
index 9a4355bbe3..ef2aa66dcb 100644
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -22,7 +22,7 @@ subtitle: 按钮
 type | 设置按钮类型，可选值为 `primary` `ghost` `dashed` 或者不设 | string | -
 htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
 icon | 设置按钮的图标类型 | string | -
-shape | 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设 | string | -
+shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | -
 size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default`
 loading | 设置按钮载入状态 | boolean | false
 onClick | `click` 事件的 handler | function | -
diff --git a/tests/button/__snapshots__/demo.test.js.snap b/tests/button/__snapshots__/demo.test.js.snap
index 9029b4ef0f..42ffaa7383 100644
--- a/tests/button/__snapshots__/demo.test.js.snap
+++ b/tests/button/__snapshots__/demo.test.js.snap
@@ -292,9 +292,24 @@ exports[`test renders ./components/button/demo/icon.md correctly 1`] = `
       Search
     </span>
   </button>
+  <button
+    class="ant-btn ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
   <br />
   <button
-    class="ant-btn ant-btn-ghost ant-btn-circle-outline ant-btn-icon-only"
+    class="ant-btn ant-btn-ghost ant-btn-circle ant-btn-icon-only"
     type="button">
     <i
       class="anticon anticon-search" />
@@ -308,6 +323,21 @@ exports[`test renders ./components/button/demo/icon.md correctly 1`] = `
       Search
     </span>
   </button>
+  <button
+    class="ant-btn ant-btn-dashed ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn ant-btn-dashed"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
 </div>
 `;