diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index cb9562d1..602ba777 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -30,7 +30,7 @@ const Copy = styled.div`
 const Footer = ({ toggle }) => (
     <Wrapper>
         <Copy>&copy; {getYear(new Date())}</Copy>
-        <StyledLink href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi" isGreen>SatoshiLabs</StyledLink>
+        <StyledLink href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" isGreen>SatoshiLabs</StyledLink>
         <StyledLink href="tos.pdf" target="_blank" rel="noreferrer noopener" isGreen>Terms</StyledLink>
         <StyledLink onClick={toggle} isGreen>Show Log</StyledLink>
     </Wrapper>
diff --git a/src/components/modals/index.js b/src/components/modals/index.js
index e62094b7..249daec5 100644
--- a/src/components/modals/index.js
+++ b/src/components/modals/index.js
@@ -132,7 +132,7 @@ class Modal extends Component<Props> {
         if (opened) {
             ch = (
                 <Fade key="1">
-                    <ModalContainer className="modal-container">
+                    <ModalContainer>
                         <ModalWindow>
                             { component }
                         </ModalWindow>
diff --git a/src/components/modals/passphrase/Passphrase/index.js b/src/components/modals/passphrase/Passphrase/index.js
index 4948e08e..18e7d77e 100644
--- a/src/components/modals/passphrase/Passphrase/index.js
+++ b/src/components/modals/passphrase/Passphrase/index.js
@@ -314,7 +314,7 @@ export default class PinModal extends Component<Props, State> {
                     <Checkbox onClick={showPassphraseCheckboxFn} checked={visible}>Show passphrase</Checkbox>
                 </Row>
                 <Row>
-                    <Button type="button" className="submit" tabIndex="4" disabled={!match} onClick={event => this.submit()}>Enter</Button>
+                    <Button type="button" tabIndex="4" disabled={!match} onClick={event => this.submit()}>Enter</Button>
                 </Row>
                 <Footer>
                     <P isSmaller>If you want to access your default account</P>
diff --git a/src/components/modals/pin/Pin/index.js b/src/components/modals/pin/Pin/index.js
index b9d15591..d3c0ae91 100644
--- a/src/components/modals/pin/Pin/index.js
+++ b/src/components/modals/pin/Pin/index.js
@@ -139,7 +139,7 @@ class Pin extends Component<Props, State> {
         const { device } = this.props.modal;
         const { pin } = this.state;
         return (
-            <Wrapper className="pin">
+            <Wrapper>
                 <H2>Enter { device.label } PIN</H2>
                 <P isSmaller>The PIN layout is displayed on your TREZOR.</P>
                 <InputRow>
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index f74e1e2d..7012d101 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -114,11 +114,7 @@ class DeviceMenu extends Component<Props> {
                 />
                 <ButtonWrapper>
                     {isWebUSB(transport) && (
-                        <StyledButton
-                            className="trezor-webusb-button"
-                            isWebUsb
-                        >Check for devices
-                        </StyledButton>
+                        <StyledButton isWebUsb>Check for devices</StyledButton>
                     )}
                 </ButtonWrapper>
             </Wrapper>