diff --git a/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml b/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
index d46312008b..bcf893cb68 100644
--- a/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
+++ b/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
@@ -4,9 +4,11 @@ import QtQuick.Layouts 1.13
 import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string urlError: ""
     property string nameError: ""
diff --git a/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml b/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
index 6528422861..6e19ecaa35 100644
--- a/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
+++ b/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
@@ -3,10 +3,12 @@ import QtQuick.Controls 2.13
 import QtQuick.Layouts 1.13
 import QtWebEngine 1.10
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 import utils 1.0
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     property QtObject request
diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/TransferOwnershipPopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/TransferOwnershipPopup.qml
index 070a55d868..ddef1f90a4 100644
--- a/ui/app/AppLayouts/Chat/CommunityComponents/TransferOwnershipPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/TransferOwnershipPopup.qml
@@ -9,6 +9,7 @@ import StatusQ.Popups 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 
 StatusModal {
     id: popup
diff --git a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
index 24a320efc2..a402fb17a2 100644
--- a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
@@ -5,6 +5,7 @@ import QtQml.Models 2.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "./"
 
diff --git a/ui/app/AppLayouts/Chat/components/NicknamePopup.qml b/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
index a52d2a7d44..edfbe273c0 100644
--- a/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "./"
 
diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
index 60ea39bec9..407da0fb96 100644
--- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../data/channelList.js" as ChannelJSON
 import "./"
diff --git a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
index 23b6ca8ce8..82e6550b44 100644
--- a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "./"
 
diff --git a/ui/app/AppLayouts/Node/views/RateView.qml b/ui/app/AppLayouts/Node/views/RateView.qml
index 8b564c667e..86b028cbf2 100644
--- a/ui/app/AppLayouts/Node/views/RateView.qml
+++ b/ui/app/AppLayouts/Node/views/RateView.qml
@@ -7,6 +7,7 @@ import StatusQ.Core.Theme 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 
diff --git a/ui/app/AppLayouts/Onboarding/popups/KeycardCreatePINModal.qml b/ui/app/AppLayouts/Onboarding/popups/KeycardCreatePINModal.qml
index 08ae711266..bb380d3e71 100644
--- a/ui/app/AppLayouts/Onboarding/popups/KeycardCreatePINModal.qml
+++ b/ui/app/AppLayouts/Onboarding/popups/KeycardCreatePINModal.qml
@@ -10,6 +10,7 @@ import StatusQ.Popups 0.1
 import utils 1.0 as Imports
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/keycard"
 
 StatusModal {
diff --git a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
index c01e9396dc..3196ab4ae3 100644
--- a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
+++ b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
@@ -6,7 +6,9 @@ import StatusQ.Controls 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property bool loading: false
     property bool firstPasswordFieldValid: false
diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
index d85003d9ad..f61aaa0317 100644
--- a/ui/app/AppLayouts/Onboarding/views/LoginView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
@@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13
 
 import "../../../../shared"
 import "../../../../shared/popups"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../popups"
 import "../stores"
diff --git a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
index 8b4b7745ed..06bfcd0adc 100644
--- a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
@@ -5,8 +5,10 @@ import QtQuick.Layouts 1.3
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/popups"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     
diff --git a/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml b/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml
index 945140acab..c5763d82fb 100644
--- a/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.12
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 
 import StatusQ.Popups 0.1
 import StatusQ.Controls 0.1
diff --git a/ui/app/AppLayouts/Profile/popups/HomepageModal.qml b/ui/app/AppLayouts/Profile/popups/HomepageModal.qml
index 3d4f9afb2d..c594d690f8 100644
--- a/ui/app/AppLayouts/Profile/popups/HomepageModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/HomepageModal.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 // TODO: replace with StatusModal
diff --git a/ui/app/AppLayouts/Profile/popups/NewCustomNetworkModal.qml b/ui/app/AppLayouts/Profile/popups/NewCustomNetworkModal.qml
index d9c0106f16..fa3c8a6665 100644
--- a/ui/app/AppLayouts/Profile/popups/NewCustomNetworkModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/NewCustomNetworkModal.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 import StatusQ.Popups 0.1
diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml
index ebb43de364..1e85b0cafb 100644
--- a/ui/app/AppLayouts/Profile/views/ContactsView.qml
+++ b/ui/app/AppLayouts/Profile/views/ContactsView.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/popups"
+import "../../../../shared/controls"
 import "../../../../shared/status/core"
 import "../../../../shared/status"
 
diff --git a/ui/app/AppLayouts/Profile/views/DevicesView.qml b/ui/app/AppLayouts/Profile/views/DevicesView.qml
index 98505ad694..b0ff24a4b8 100644
--- a/ui/app/AppLayouts/Profile/views/DevicesView.qml
+++ b/ui/app/AppLayouts/Profile/views/DevicesView.qml
@@ -9,6 +9,7 @@ import StatusQ.Controls 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
index c9f4fb427e..a8f7a8ab06 100644
--- a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
@@ -7,6 +7,7 @@ import StatusQ.Core.Theme 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/views/SyncView.qml b/ui/app/AppLayouts/Profile/views/SyncView.qml
index ffa7b702fc..055a83ec53 100644
--- a/ui/app/AppLayouts/Profile/views/SyncView.qml
+++ b/ui/app/AppLayouts/Profile/views/SyncView.qml
@@ -8,6 +8,7 @@ import StatusQ.Controls 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 
 Item {
diff --git a/ui/app/AppLayouts/Wallet/popups/AccountSettingsModal.qml b/ui/app/AppLayouts/Wallet/popups/AccountSettingsModal.qml
index bc030b9854..2f8ab092ea 100644
--- a/ui/app/AppLayouts/Wallet/popups/AccountSettingsModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AccountSettingsModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Dialogs 1.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 
diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml
index 1cd26211ed..0dabf98468 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     //% "Add account from private key"
diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountWithSeedModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountWithSeedModal.qml
index 18180d916b..2c3af5cac1 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddAccountWithSeedModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddAccountWithSeedModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     height: 615
diff --git a/ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml b/ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml
index d73f039998..43c0c515d0 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 
diff --git a/ui/app/AppLayouts/Wallet/popups/AddWatchOnlyAccountModal.qml b/ui/app/AppLayouts/Wallet/popups/AddWatchOnlyAccountModal.qml
index 4ee270e991..28086c7761 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddWatchOnlyAccountModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddWatchOnlyAccountModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     //% "Add a watch-only account"
diff --git a/ui/app/AppLayouts/Wallet/popups/GenerateAccountModal.qml b/ui/app/AppLayouts/Wallet/popups/GenerateAccountModal.qml
index 5486bb9413..53bfa2c88d 100644
--- a/ui/app/AppLayouts/Wallet/popups/GenerateAccountModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/GenerateAccountModal.qml
@@ -5,9 +5,11 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/controls"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     //% "Generate an account"
diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
index a399f3ebdd..c15d4e6ddd 100644
--- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
@@ -7,6 +7,7 @@ import "../../../../shared"
 import "../../../../shared/controls"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property alias selectedAccount: accountSelector.selectedAccount
     id: popup
diff --git a/ui/shared/SearchBox.qml b/ui/shared/SearchBox.qml
index 4390ad9ebe..3332ec1b2b 100644
--- a/ui/shared/SearchBox.qml
+++ b/ui/shared/SearchBox.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.13
 
 import utils 1.0
+import "./controls"
 
 Input {
     id: searchBox
diff --git a/ui/shared/TransactionSigner.qml b/ui/shared/TransactionSigner.qml
index 44045ed30b..d9e2536820 100644
--- a/ui/shared/TransactionSigner.qml
+++ b/ui/shared/TransactionSigner.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../shared/status"
+import "./controls"
 
 Item {
     id: root
diff --git a/ui/shared/controls/ContactSelector.qml b/ui/shared/controls/ContactSelector.qml
index 3e6806944e..28837d7a41 100644
--- a/ui/shared/controls/ContactSelector.qml
+++ b/ui/shared/controls/ContactSelector.qml
@@ -7,6 +7,7 @@ import utils 1.0
 import "../"
 import "../views"
 import "../status"
+import "."
 
 Item {
     id: root
diff --git a/ui/shared/controls/ContactsListAndSearch.qml b/ui/shared/controls/ContactsListAndSearch.qml
index b12913adc0..64ec2ab1ab 100644
--- a/ui/shared/controls/ContactsListAndSearch.qml
+++ b/ui/shared/controls/ContactsListAndSearch.qml
@@ -6,6 +6,7 @@ import utils 1.0
 import "../"
 import "../views"
 import "../status"
+import "."
 
 Item {
     property string validationError: ""
diff --git a/ui/shared/Input.qml b/ui/shared/controls/Input.qml
similarity index 99%
rename from ui/shared/Input.qml
rename to ui/shared/controls/Input.qml
index 92b8046dcb..4b3091d855 100644
--- a/ui/shared/Input.qml
+++ b/ui/shared/controls/Input.qml
@@ -5,8 +5,8 @@ import StatusQ.Popups 0.1
 
 
 import utils 1.0
-import "../shared/status"
-import "."
+import "../status"
+import "../"
 
 Item {
     property alias textField: inputValue
diff --git a/ui/shared/keycard/PINModal.qml b/ui/shared/keycard/PINModal.qml
index 907c9c7bfa..3e402e009b 100644
--- a/ui/shared/keycard/PINModal.qml
+++ b/ui/shared/keycard/PINModal.qml
@@ -8,6 +8,7 @@ import StatusQ.Popups 0.1
 
 import "../../imports/utils" as Imports
 import "../../shared"
+import "../../shared/controls"
 
 StatusModal {
     property bool pinFieldValid: false
diff --git a/ui/shared/keycard/PairingModal.qml b/ui/shared/keycard/PairingModal.qml
index b54e399bd0..d7289ebbca 100644
--- a/ui/shared/keycard/PairingModal.qml
+++ b/ui/shared/keycard/PairingModal.qml
@@ -6,6 +6,7 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 import StatusQ.Popups 0.1
 import "../../shared"
+import "../../shared/controls"
 
 StatusModal {
     property bool pairingPasswordFieldValid: false