diff --git a/ui/app/AppLayouts/Chat/controls/Contact.qml b/ui/app/AppLayouts/Chat/controls/Contact.qml
index 8c08f91ea6..69b1e32f28 100644
--- a/ui/app/AppLayouts/Chat/controls/Contact.qml
+++ b/ui/app/AppLayouts/Chat/controls/Contact.qml
@@ -4,7 +4,8 @@ import QtQuick.Layouts 1.3
 import Qt.labs.platform 1.1
 
 import utils 1.0
-import "../../../../shared"
+
+import StatusQ.Controls 0.1 as StatusQControls
 import "../../../../shared/panels"
 import "../../../../shared/status"
 
@@ -56,7 +57,7 @@ Rectangle {
         anchors.leftMargin: Style.current.padding
     }
 
-    StatusCheckBox  {
+    StatusQControls.StatusCheckBox  {
         id: assetCheck
         visible: showCheckbox && !isUser
         anchors.top: accountImage.top
diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
index 213bf8ecad..11332d768c 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
@@ -2,9 +2,6 @@ import QtQuick 2.12
 import QtQuick.Controls 2.3
 import QtQuick.Dialogs 1.3
 
-import utils 1.0
-import "../../../../../shared/popups"
-
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Components 0.1
@@ -12,6 +9,9 @@ import StatusQ.Controls 0.1
 import StatusQ.Controls.Validators 0.1
 import StatusQ.Popups 0.1
 
+import utils 1.0
+import "../../../../../shared/popups"
+
 StatusModal {
     property string communityId
     property string categoryId
diff --git a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
index 5458362cbf..783c517c31 100644
--- a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.14
 
 import utils 1.0
-import "../../../../shared"
+
 import "../../../../shared/popups"
 import "../../../../shared/status"
 
diff --git a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
index 0e1855f1c2..1743b40954 100644
--- a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml
@@ -4,11 +4,11 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 
-import "../../../../shared"
+import StatusQ.Controls 0.1
+
 import "../../../../shared/popups"
 import "../../../../shared/panels"
 import "../../../../shared/controls"
-import "../../../../shared/status"
 
 Item {
     id: modalBody
diff --git a/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml b/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml
index d3b947266c..9924444009 100644
--- a/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml
+++ b/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml
@@ -2,12 +2,13 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
+
+import StatusQ.Core 0.1
+import StatusQ.Core.Theme 0.1
 import StatusQ.Components 0.1
 import StatusQ.Controls 0.1
 
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/panels"
 
 // TODO: replace with StatusModal
 Popup {
@@ -55,12 +56,13 @@ Popup {
                 Item {
                     width: content.width
                     height: 40
-                    StyledText {
+                    StatusBaseText {
                         anchors.left: parent.left
                         anchors.leftMargin: Style.current.bigPadding
                         anchors.verticalCenter: parent.verticalCenter
                         font.pixelSize: Style.current.primaryTextFontSize
                         text: model.chainName
+                        color: Theme.palette.directColor1
                     }
 
                     StatusCheckBox {
diff --git a/ui/shared/status/StatusCheckBox.qml b/ui/shared/status/StatusCheckBox.qml
deleted file mode 100644
index 1017a561cd..0000000000
--- a/ui/shared/status/StatusCheckBox.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtGraphicalEffects 1.13
-
-import utils 1.0
-import "../../shared"
-import "../../shared/panels"
-
-CheckBox {
-    id: control
-
-    indicator: Rectangle {
-        implicitWidth: 18
-        implicitHeight: 18
-        x: control.leftPadding
-        y: parent.height / 2 - height / 2
-        radius: 3
-        color: (control.down || control.checked) ? Style.current.primary : Style.current.inputBackground
-
-        SVGImage {
-            source: Style.svg("checkmark")
-            width: 16
-            height: 16
-            anchors.centerIn: parent
-            visible: control.down || control.checked
-        }
-    }
-
-    contentItem: StyledText {
-        text: control.text
-        opacity: enabled ? 1.0 : 0.3
-        verticalAlignment: Text.AlignVCenter
-        wrapMode: Text.WordWrap
-        width: parent.width
-        leftPadding: !!control.text ? control.indicator.width + control.spacing : control.indicator.width
-    }
-}
-