diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx
index 4c60f0b703..b3f40b8182 100644
--- a/src/components/button/index.tsx
+++ b/src/components/button/index.tsx
@@ -61,18 +61,13 @@ class Button extends PureComponent<Props, ButtonState> {
     }
   };
 
-  get isOutline() {
-    const {outline, outlineColor} = this.props;
-    return Boolean(outline || outlineColor);
-  }
-
   get isLink() {
     const {link, hyperlink} = this.props;
     return link || hyperlink;
   }
 
   get isFilled() {
-    return !this.isOutline && !this.isLink;
+    return this.getBackgroundColor() !== 'transparent';
   }
 
   get isIconButton() {
@@ -116,7 +111,7 @@ class Button extends PureComponent<Props, ButtonState> {
       color = backgroundColor === 'transparent' ? undefined : Colors.$iconDefaultLight;
     }
 
-    if (disabled && (isLink || outline)) {
+    if (disabled && !this.isFilled) {
       return Colors.$textDisabled;
     }