diff --git a/ui/app/AppLayouts/Browser/views/WebProviderObj.qml b/ui/app/AppLayouts/Browser/views/WebProviderObj.qml
index deebf7dc64..d83b2805f8 100644
--- a/ui/app/AppLayouts/Browser/views/WebProviderObj.qml
+++ b/ui/app/AppLayouts/Browser/views/WebProviderObj.qml
@@ -3,6 +3,7 @@ import QtWebChannel 1.13
 
 import utils 1.0
 
+import "../../../../shared/controls"
 import "../stores"
 
 QtObject {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index 2aae4c22a7..e758e34ba4 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -10,6 +10,7 @@ import StatusQ.Controls 0.1
 
 import "../../../shared"
 import "../../../shared/status"
+import "../../../shared/controls"
 import "../../../shared/popups"
 
 import utils 1.0
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/AcceptTransaction.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/AcceptTransaction.qml
index ea9ae473d8..bca0aa6e66 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/AcceptTransaction.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/AcceptTransaction.qml
@@ -2,6 +2,7 @@ import QtQuick 2.3
 import "../../ChatComponents"
 import "../../../../../../shared"
 import "../../../../../../shared/popups"
+import "../../../../../../shared/controls"
 
 import utils 1.0
 
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SendTransactionButton.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SendTransactionButton.qml
index ca97cff939..0cfd908e09 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SendTransactionButton.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SendTransactionButton.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.3
 import "../../../../../../shared"
+import "../../../../../../shared/controls"
 
 import utils 1.0
 import "../../ChatComponents"
diff --git a/ui/shared/TransactionPreview.qml b/ui/shared/TransactionPreview.qml
index 4c9cfd48e9..570715b58f 100644
--- a/ui/shared/TransactionPreview.qml
+++ b/ui/shared/TransactionPreview.qml
@@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../shared/status"
 import "../shared/panels"
+import "../shared/controls"
 import "../shared/popups"
 
 Item {
diff --git a/ui/shared/controls/AccountSelector.qml b/ui/shared/controls/AccountSelector.qml
index 22710c5ab9..40547a2f11 100644
--- a/ui/shared/controls/AccountSelector.qml
+++ b/ui/shared/controls/AccountSelector.qml
@@ -7,6 +7,7 @@ import QtQml.Models 2.14
 import utils 1.0
 import "../../shared"
 import "../status"
+import "."
 
 Item {
     id: root
diff --git a/ui/shared/RecipientSelector.qml b/ui/shared/controls/RecipientSelector.qml
similarity index 99%
rename from ui/shared/RecipientSelector.qml
rename to ui/shared/controls/RecipientSelector.qml
index a01b8ab908..45ef0fdcd2 100644
--- a/ui/shared/RecipientSelector.qml
+++ b/ui/shared/controls/RecipientSelector.qml
@@ -5,8 +5,8 @@ import QtGraphicalEffects 1.13
 
 import utils 1.0
 
-import "./controls"
-import "./panels"
+import "."
+import "../panels"
 
 Item {
     id: root