diff --git a/components/button/button.tsx b/components/button/button.tsx
index 6bfe1e595f..c37248214b 100644
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -146,7 +146,7 @@ export default class Button extends React.Component<ButtonProps, any> {
       [`${prefixCls}-${type}`]: type,
       [`${prefixCls}-${shape}`]: shape,
       [`${prefixCls}-${sizeCls}`]: sizeCls,
-      [`${prefixCls}-icon-only`]: !children && icon && !loading,
+      [`${prefixCls}-icon-only`]: !children && icon,
       [`${prefixCls}-loading`]: loading,
       [`${prefixCls}-clicked`]: clicked,
       [`${prefixCls}-background-ghost`]: ghost,
diff --git a/components/button/style/index.less b/components/button/style/index.less
index 6d671239fc..e9b930802a 100644
--- a/components/button/style/index.less
+++ b/components/button/style/index.less
@@ -93,7 +93,7 @@
     display: block;
   }
 
-  &&-loading:not(&-circle):not(&-circle-outline) {
+  &&-loading:not(&-circle):not(&-circle-outline):not(&-icon-only) {
     padding-left: 29px;
     pointer-events: none;
     position: relative;
@@ -102,7 +102,7 @@
     }
   }
 
-  &-sm&-loading:not(&-circle):not(&-circle-outline) {
+  &-sm&-loading:not(&-circle):not(&-circle-outline):not(&-icon-only) {
     padding-left: 24px;
     .@{iconfont-css-prefix} {
       margin-left: -17px;