diff --git a/src/components/modal/ForgetDevice/index.js b/src/components/modal/ForgetDevice/index.js
index d0b09cd0..75ab4a70 100644
--- a/src/components/modal/ForgetDevice/index.js
+++ b/src/components/modal/ForgetDevice/index.js
@@ -55,8 +55,8 @@ class ForgetDevice extends Component {
                 <H3>Forget { device.instanceLabel }?</H3>
                 <StyledP isSmaller>Forgetting only removes the device from the list on the left, your coins are still safe and you can access them by reconnecting your TREZOR again.</StyledP>
                 <Row>
-                    <StyledButton onClick={() => this.forget()} text="Forget" />
-                    <StyledButton isWhite onClick={onCancel} text="Don't forget" />
+                    <StyledButton onClick={() => this.forget()}>Forget</StyledButton>
+                    <StyledButton isWhite onClick={onCancel}>Don't forget</StyledButton>
                 </Row>
             </Wrapper>
         );
diff --git a/src/views/Landing/components/BrowserNotSupported/index.js b/src/views/Landing/components/BrowserNotSupported/index.js
index 867fb365..34b5920e 100644
--- a/src/views/Landing/components/BrowserNotSupported/index.js
+++ b/src/views/Landing/components/BrowserNotSupported/index.js
@@ -44,9 +44,7 @@ const BrowserNotSupported = () => (
                     target="_blank"
                     rel="noreferrer noopener"
                 >
-                    <Button
-                        text="Get Chrome"
-                    />
+                    <Button>Get Chrome</Button>
                 </Link>
             </Browser>
             <Browser>
@@ -57,9 +55,7 @@ const BrowserNotSupported = () => (
                     target="_blank"
                     rel="noreferrer noopener"
                 >
-                    <Button
-                        text="Get Firefox"
-                    />
+                    <Button>Get Firefox</Button>
                 </Link>
 
             </Browser>
diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js
index 40ac60f3..f7600bee 100644
--- a/src/views/Landing/components/ConnectDevice/index.js
+++ b/src/views/Landing/components/ConnectDevice/index.js
@@ -91,9 +91,9 @@ class ConnectDevice extends Component<Props> {
                         <P>and</P>
                         <Button
                             className="trezor-webusb-button"
-                            text="Check for devices"
                             isWebUsb
-                        />
+                        >Check for devices
+                        </Button>
                     </React.Fragment>
                 )}
             </Wrapper>
diff --git a/src/views/Landing/components/InstallBridge/index.js b/src/views/Landing/components/InstallBridge/index.js
index ccb5808f..e2dc186d 100644
--- a/src/views/Landing/components/InstallBridge/index.js
+++ b/src/views/Landing/components/InstallBridge/index.js
@@ -126,8 +126,8 @@ export default class InstallBridge extends Component<Props, State> {
                                 color: colors.WHITE,
                                 size: 30,
                             }}
-                            text={`Download for ${label}`}
-                        />
+                        >Download for {label}
+                        </Button>
                     </Link>
                 </DownloadBridgeWrapper>
                 <P>
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index 839ba306..cf8f15a5 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -109,9 +109,9 @@ class DeviceMenu extends Component<Props> {
                     {isWebUSB(transport) && (
                         <Button
                             className="trezor-webusb-button"
-                            text="Check for devices"
                             isWebUsb
-                        />
+                        >Check for devices
+                        </Button>
                     )}
                 </ButtonWrapper>
             </Wrapper>
diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js
index ec84012f..c1cb2a05 100644
--- a/src/views/Wallet/views/DeviceSettings/index.js
+++ b/src/views/Wallet/views/DeviceSettings/index.js
@@ -40,7 +40,7 @@ const DeviceSettings = () => (
             <StyledH2>Device settings is under construction</StyledH2>
             <P>Please use Bitcoin wallet interface to change your device settings</P>
             <a href="https://wallet.trezor.io/">
-                <Button text="Take me to the Bitcoin wallet" />
+                <Button>Take me to the Bitcoin wallet</Button>
             </a>
         </Row>
     </Section>
diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js
index a957c110..a9ee478d 100644
--- a/src/views/Wallet/views/Initialize/index.js
+++ b/src/views/Wallet/views/Initialize/index.js
@@ -33,7 +33,7 @@ const Initialize = () => (
             <H2>Your device is in not initialized</H2>
             <StyledParagraph>Please use Bitcoin wallet interface to start initialization process</StyledParagraph>
             <A href="https://wallet.trezor.io/">
-                <Button text="Take me to the Bitcoin wallet" />
+                <Button>Take me to the Bitcoin wallet</Button>
             </A>
         </Row>
     </Wrapper>