diff --git a/src/components/Notification/index.js b/src/components/Notification/index.js
index 9505e26f..8030dbec 100644
--- a/src/components/Notification/index.js
+++ b/src/components/Notification/index.js
@@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import styled, { css } from 'styled-components';
 import colors from 'config/colors';
-import NotificationButton from 'components/NotificationButton';
+import NotificationButton from 'components/buttons/NotificationButton';
 import Icon from 'components/Icon';
 import icons from 'config/icons';
 import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
diff --git a/src/components/Button/index.js b/src/components/buttons/Button/index.js
similarity index 100%
rename from src/components/Button/index.js
rename to src/components/buttons/Button/index.js
diff --git a/src/components/NotificationButton/index.js b/src/components/buttons/NotificationButton/index.js
similarity index 100%
rename from src/components/NotificationButton/index.js
rename to src/components/buttons/NotificationButton/index.js
diff --git a/src/views/Landing/components/BrowserNotSupported/index.js b/src/views/Landing/components/BrowserNotSupported/index.js
index 69dbfe11..867fb365 100644
--- a/src/views/Landing/components/BrowserNotSupported/index.js
+++ b/src/views/Landing/components/BrowserNotSupported/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled, { css } from 'styled-components';
 import Link from 'components/Link';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import P from 'components/Paragraph';
 import { H2 } from 'components/Heading';
 
diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js
index d9b40232..40ac60f3 100644
--- a/src/views/Landing/components/ConnectDevice/index.js
+++ b/src/views/Landing/components/ConnectDevice/index.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import styled, { keyframes } from 'styled-components';
 import TrezorConnect from 'trezor-connect';
 import P from 'components/Paragraph';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import { PULSATE } from 'config/animations';
 import colors from 'config/colors';
 import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
diff --git a/src/views/Landing/components/InstallBridge/index.js b/src/views/Landing/components/InstallBridge/index.js
index 074cec7c..ccb5808f 100644
--- a/src/views/Landing/components/InstallBridge/index.js
+++ b/src/views/Landing/components/InstallBridge/index.js
@@ -7,7 +7,7 @@ import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
 import installers from 'constants/bridge';
 import Select from 'components/Select';
 import Link from 'components/Link';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import Loader from 'components/Loader';
 import P from 'components/Paragraph';
 import ICONS from 'config/icons';
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
index f27b36db..839ba306 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import TrezorConnect from 'trezor-connect';
 import type { TrezorDevice } from 'flowtype';
 import DeviceHeader from 'components/DeviceHeader';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import { isWebUSB } from 'utils/device';
 import MenuItems from './components/MenuItems';
 import DeviceList from './components/DeviceList';
diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js
index 5cc3d11e..ec84012f 100644
--- a/src/views/Wallet/views/DeviceSettings/index.js
+++ b/src/views/Wallet/views/DeviceSettings/index.js
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import { H2 } from 'components/Heading';
 import Icon from 'components/Icon';
 import colors from 'config/colors';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import ICONS from 'config/icons';
 import { connect } from 'react-redux';
 
diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js
index ca8cd301..a957c110 100644
--- a/src/views/Wallet/views/Initialize/index.js
+++ b/src/views/Wallet/views/Initialize/index.js
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 import { H2 } from 'components/Heading';
-import Button from 'components/Button';
+import Button from 'components/buttons/Button';
 import Paragraph from 'components/Paragraph';
 import React from 'react';
 import { connect } from 'react-redux';