diff --git a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
index eeaff13669..c21b9f82f6 100644
--- a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
+++ b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/status"
-import "../../../../shared/panels"
+import "../../../../shared/controls"
 import "../controls"
 import "../stores"
 
diff --git a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
index d1e9e25fa4..d44fd17d1d 100644
--- a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
+++ b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
@@ -5,7 +5,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/status"
-import "../../../../shared/panels"
+import "../../../../shared/controls"
 import "../../Wallet/views"
 import "../stores"
 
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml
index 9d3ccd4efb..2b643903c8 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml
@@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../../../../../shared"
 import "../../../../../shared/panels"
-import "../../../../../shared/views"
+import "../../../../../shared/controls"
 import "../../../../../shared/status"
 
 ModalPopup {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
index e896333366..a47ca801a6 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
@@ -7,6 +7,7 @@ import utils 1.0
 import "../../../../../shared"
 import "../../../../../shared/status"
 import "../../../../../shared/panels"
+import "../../../../../shared/controls"
 import "../../../../../shared/popups"
 
 ModalPopup {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SelectAccountModal.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SelectAccountModal.qml
index cd04ea3d5a..c7ef122a42 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SelectAccountModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SelectAccountModal.qml
@@ -5,7 +5,7 @@ import QtQuick.Dialogs 1.3
 
 import utils 1.0
 import "../../../../../../shared"
-import "../../../../../../shared/panels"
+import "../../../../../../shared/controls"
 import "../../../../../../shared/status"
 
 ModalPopup {
diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
index 61db80a6aa..a399f3ebdd 100644
--- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls 2.13
 import utils 1.0
 
 import "../../../../shared"
-import "../../../../shared/panels"
+import "../../../../shared/controls"
 import "../stores"
 
 ModalPopup {
diff --git a/ui/shared/RecipientSelector.qml b/ui/shared/RecipientSelector.qml
index d8123b0fa2..a01b8ab908 100644
--- a/ui/shared/RecipientSelector.qml
+++ b/ui/shared/RecipientSelector.qml
@@ -5,7 +5,6 @@ import QtGraphicalEffects 1.13
 
 import utils 1.0
 
-import "./views"
 import "./controls"
 import "./panels"
 
diff --git a/ui/shared/panels/AccountSelector.qml b/ui/shared/controls/AccountSelector.qml
similarity index 100%
rename from ui/shared/panels/AccountSelector.qml
rename to ui/shared/controls/AccountSelector.qml
diff --git a/ui/shared/views/AddressInput.qml b/ui/shared/controls/AddressInput.qml
similarity index 100%
rename from ui/shared/views/AddressInput.qml
rename to ui/shared/controls/AddressInput.qml
diff --git a/ui/shared/panels/AddressSourceSelector.qml b/ui/shared/controls/AddressSourceSelector.qml
similarity index 100%
rename from ui/shared/panels/AddressSourceSelector.qml
rename to ui/shared/controls/AddressSourceSelector.qml
diff --git a/ui/shared/views/AssetAndAmountInput.qml b/ui/shared/controls/AssetAndAmountInput.qml
similarity index 99%
rename from ui/shared/views/AssetAndAmountInput.qml
rename to ui/shared/controls/AssetAndAmountInput.qml
index f73181702a..a9dbacab4c 100644
--- a/ui/shared/views/AssetAndAmountInput.qml
+++ b/ui/shared/controls/AssetAndAmountInput.qml
@@ -6,7 +6,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 
 import "../"
-import "../panels"
+import "."
 
 Item {
     //% "Insufficient balance"
diff --git a/ui/shared/panels/AssetSelector.qml b/ui/shared/controls/AssetSelector.qml
similarity index 100%
rename from ui/shared/panels/AssetSelector.qml
rename to ui/shared/controls/AssetSelector.qml
diff --git a/ui/shared/popups/SendModal.qml b/ui/shared/popups/SendModal.qml
index 5713e4b915..b9c2c39e07 100644
--- a/ui/shared/popups/SendModal.qml
+++ b/ui/shared/popups/SendModal.qml
@@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../"
 import "../panels"
-import "../views"
+import "../controls"
 import "../status"
 
 ModalPopup {
diff --git a/ui/shared/status/StatusETHTransactionModal.qml b/ui/shared/status/StatusETHTransactionModal.qml
index b80d51fbec..b5a6c77266 100644
--- a/ui/shared/status/StatusETHTransactionModal.qml
+++ b/ui/shared/status/StatusETHTransactionModal.qml
@@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../../shared"
 import "../../shared/status"
-import "../../shared/panels"
+import "../../shared/controls"
 import "../../shared/popups"
 
 ModalPopup {
diff --git a/ui/shared/status/StatusSNTTransactionModal.qml b/ui/shared/status/StatusSNTTransactionModal.qml
index 1a70188f69..ebb07a00cb 100644
--- a/ui/shared/status/StatusSNTTransactionModal.qml
+++ b/ui/shared/status/StatusSNTTransactionModal.qml
@@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../../shared"
 import "../../shared/status"
-import "../../shared/panels"
+import "../../shared/controls"
 import "../../shared/popups"
 
 ModalPopup {