diff --git a/src/components/modals/passphrase/Passphrase/index.js b/src/components/modals/passphrase/Passphrase/index.js
index 8e01c85a..39e0c119 100644
--- a/src/components/modals/passphrase/Passphrase/index.js
+++ b/src/components/modals/passphrase/Passphrase/index.js
@@ -307,7 +307,7 @@ export default class PinModal extends Component<Props, State> {
                             onBlur={() => this.onPassphraseBlur('revision')}
                             tabIndex="2"
                         />
-                        {!match && passphraseRevisionTouched && <PassphraseError className="error">Passphrases do not match</PassphraseError> }
+                        {!match && passphraseRevisionTouched && <PassphraseError>Passphrases do not match</PassphraseError> }
                     </Row>
                 ) }
                 <Row>
diff --git a/src/store.js b/src/store.js
index 2316638c..ad9549dc 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,6 +1,5 @@
 /* @flow */
 
-
 import { createStore, applyMiddleware, compose } from 'redux';
 import { routerMiddleware, push } from 'react-router-redux';
 import thunk from 'redux-thunk';
diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js
index 3290e149..f5612ffa 100644
--- a/src/views/Landing/components/ConnectDevice/index.js
+++ b/src/views/Landing/components/ConnectDevice/index.js
@@ -89,11 +89,7 @@ class ConnectDevice extends Component<Props> {
                 {this.props.showWebUsb && (
                     <React.Fragment>
                         <P>and</P>
-                        <Button
-                            className="trezor-webusb-button"
-                            isWebUsb
-                        >Check for devices
-                        </Button>
+                        <Button isWebUsb>Check for devices</Button>
                     </React.Fragment>
                 )}
             </Wrapper>
diff --git a/src/views/Landing/index.js b/src/views/Landing/index.js
index 17e3aba7..86a6a912 100644
--- a/src/views/Landing/index.js
+++ b/src/views/Landing/index.js
@@ -95,7 +95,7 @@ export default (props: Props) => {
                         <Notification
                             title="Initialization error"
                             message="Config files are missing"
-                            className="error"
+                            type="error"
                         />
                     )}
                     <Notifications />
diff --git a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
index a4345f52..93e7427e 100644
--- a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
@@ -202,7 +202,6 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
             } else {
                 discoveryStatus = (
                     <Tooltip
-                        arrowContent={<div className="rc-tooltip-arrow-inner" />}
                         content={<React.Fragment>To add a new account, last account must have some transactions.</React.Fragment>}
                         placement="bottom"
                     >
diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js
index 5f4f3b54..25034591 100644
--- a/src/views/Wallet/components/TopNavigationAccount/index.js
+++ b/src/views/Wallet/components/TopNavigationAccount/index.js
@@ -42,7 +42,7 @@ const TopNavigationAccount = (props: any) => {
     const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`;
 
     return (
-        <Wrapper className="account-tabs">
+        <Wrapper>
             <StyledNavLink exact to={`${basePath}`}>Summary</StyledNavLink>
             <StyledNavLink to={`${basePath}/send`}>Send</StyledNavLink>
             <StyledNavLink to={`${basePath}/receive`}>Receive</StyledNavLink>
diff --git a/src/views/Wallet/components/TopNavigationDeviceSettings/index.js b/src/views/Wallet/components/TopNavigationDeviceSettings/index.js
index 8b7dec53..3699023b 100644
--- a/src/views/Wallet/components/TopNavigationDeviceSettings/index.js
+++ b/src/views/Wallet/components/TopNavigationDeviceSettings/index.js
@@ -1,10 +1,9 @@
 /* @flow */
 
-
+import styled from 'styled-components';
 import React, { Component } from 'react';
 import { NavLink } from 'react-router-dom';
 
-
 type Props = {
     pathname: string;
 }
@@ -15,14 +14,16 @@ type State = {
     };
 }
 
+const Wrapper = styled.div``;
+
 const AccountTabs = (props: any): any => {
     const urlParams = props.match.params;
     const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`;
 
     return (
-        <div className="account-tabs">
-            <a>Device settings</a>
-        </div>
+        <Wrapper>
+            Device settings
+        </Wrapper>
     );
 };
 
diff --git a/src/views/Wallet/views/AccountReceive/index.js b/src/views/Wallet/views/AccountReceive/index.js
index 8102a282..9b19c53c 100644
--- a/src/views/Wallet/views/AccountReceive/index.js
+++ b/src/views/Wallet/views/AccountReceive/index.js
@@ -183,7 +183,6 @@ const AccountReceive = (props: Props) => {
                     )}
                     {(addressVerified || addressUnverified) && (
                         <QRCode
-                            className="qr"
                             bgColor="#FFFFFF"
                             fgColor="#000000"
                             level="Q"
diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js
index aeda12a9..2ea20ad3 100644
--- a/src/views/Wallet/views/WalletSettings/index.js
+++ b/src/views/Wallet/views/WalletSettings/index.js
@@ -1,14 +1,13 @@
-/* @flow */
-
-
+import styled from 'styled-components';
 import React from 'react';
-import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
+const Wrapper = styled.div``;
+
 const WalletSettings = () => (
-    <section className="settings">
-            Wallet settings
-    </section>
+    <Wrapper>
+        Wallet settings
+    </Wrapper>
 );
 
 export default connect(null, null)(WalletSettings);