diff --git a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
index 85a6f52ecd..af48f36ad4 100644
--- a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
@@ -3,11 +3,12 @@ import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
 import utils 1.0
-import "../../../../shared"
+
+import StatusQ.Controls 0.1
+
 import "../../../../shared/popups"
 import "../../../../shared/panels"
 import "../../../../shared/controls"
-import "../../../../shared/status"
 
 // TODO: replace with StatusModal
 ModalPopup {
diff --git a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
index d498ec2606..0aada8811c 100644
--- a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
@@ -2,10 +2,12 @@ import QtQuick 2.13
 import QtQuick.Dialogs 1.3
 
 import utils 1.0
+
+import StatusQ.Controls 0.1
+
 import "../../../../shared"
 import "../../../../shared/popups"
 import "../../../../shared/panels"
-import "../../../../shared/status"
 
 // TODO: replace with StatusModal
 ModalPopup {
@@ -77,11 +79,9 @@ ModalPopup {
         width: parent.width
         height: uploadBtn.height
 
-        StatusButton {
+        StatusFlatButton {
             visible: popup.hasIdentityImage
-            type: "secondary"
-            flat: true
-            color: Style.current.danger
+            type: StatusBaseButton.Type.Danger
             //% "Remove"
             text: qsTrId("remove")
             anchors.right: uploadBtn.left
diff --git a/ui/app/AppLayouts/Profile/popups/ChatLinksPreviewModal.qml b/ui/app/AppLayouts/Profile/popups/ChatLinksPreviewModal.qml
index 3d4f3e0f06..2c307417c2 100644
--- a/ui/app/AppLayouts/Profile/popups/ChatLinksPreviewModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ChatLinksPreviewModal.qml
@@ -2,6 +2,9 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 
 import utils 1.0
+
+import StatusQ.Controls 0.1 as StatusQControls
+
 import "../../../../shared"
 import "../../../../shared/popups"
 import "../../../../shared/panels"
@@ -39,13 +42,11 @@ ModalPopup {
             text: qsTrId("websites")
             width: parent.width
 
-            StatusButton {
+            StatusQControls.StatusFlatButton {
                 //% "Enable all"
                 text: qsTrId("enable-all")
-                type: "secondary"
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                flat: true
                 onClicked: {
                     const count = sitesListView.count
                     for (let i = 0; i < count; i++) {
@@ -164,7 +165,7 @@ ModalPopup {
                             anchors.left: siteTitle.left
                         }
 
-                        StatusSwitch {
+                        StatusQControls.StatusSwitch {
                             id: settingSwitch
                             checked: !!isWhitelisted
                             anchors.verticalCenter: parent.verticalCenter
diff --git a/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml b/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml
index 71b568eadc..a34438718c 100644
--- a/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml
@@ -3,10 +3,12 @@ import QtQuick.Controls 2.13
 import QtQuick.Layouts 1.13
 
 import utils 1.0
+
+import StatusQ.Controls 0.1
+
 import "../../../../shared"
 import "../../../../shared/popups"
 import "../../../../shared/panels"
-import "../../../../shared/status"
 
 // TODO: replace with StatusModal
 ModalPopup {
@@ -33,7 +35,7 @@ ModalPopup {
         StatusButton {
             anchors.right: parent.right
             anchors.rightMargin: Style.current.smallPadding
-            type: "warn"
+            type: StatusBaseButton.Type.Warn
             text: qsTr("Restart")
             anchors.bottom: parent.bottom
             onClicked: Qt.quit()
diff --git a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
index 7b6c8f99f9..346dc7ff3f 100644
--- a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
@@ -4,6 +4,9 @@ import QtGraphicalEffects 1.13
 import QtQuick.Layouts 1.13
 
 import utils 1.0
+
+import StatusQ.Controls 0.1
+
 import "../../../../shared"
 import "../../../../shared/popups"
 import "../../../../shared/panels"
@@ -70,9 +73,8 @@ ModalPopup {
                 onExited: channelItem.isHovered = false
             }
 
-            StatusButton {
+            StatusFlatButton {
                 id: unmuteButton
-                type: "secondary"
                 anchors.right: parent.right
                 anchors.rightMargin: Style.current.smallPadding
                 anchors.verticalCenter: parent.verticalCenter
diff --git a/ui/app/AppLayouts/Profile/popups/PermissionList.qml b/ui/app/AppLayouts/Profile/popups/PermissionList.qml
index 14aa2784b4..86cc03b81b 100644
--- a/ui/app/AppLayouts/Profile/popups/PermissionList.qml
+++ b/ui/app/AppLayouts/Profile/popups/PermissionList.qml
@@ -9,7 +9,6 @@ import StatusQ.Controls 0.1
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/popups"
-import "../../../../shared/status"
 
 import "./"
 import "../panels"
@@ -63,10 +62,9 @@ ModalPopup {
         }
     }
     
-    // TODO: replace with StatusQ component
     footer: StatusButton {
         anchors.horizontalCenter: parent.horizontalCenter
-        type: "warn"
+        type: StatusBaseButton.type.Danger
         //% "Revoke all access"
         text: qsTrId("revoke-all-access")
         onClicked: {
diff --git a/ui/app/AppLayouts/Profile/views/DevicesView.qml b/ui/app/AppLayouts/Profile/views/DevicesView.qml
index 343bb176ff..c91d6a3aeb 100644
--- a/ui/app/AppLayouts/Profile/views/DevicesView.qml
+++ b/ui/app/AppLayouts/Profile/views/DevicesView.qml
@@ -8,10 +8,9 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 
 import utils 1.0
-import "../../../../shared"
+
 import "../../../../shared/controls"
 import "../../../../shared/panels"
-import "../../../../shared/status"
 
 Item {
     id: root
@@ -213,7 +212,6 @@ Item {
         }
     }
 
-    // TODO: replace with StatusQ component
     StatusButton {
         id: syncAllBtn
         anchors.bottom: root.bottom
diff --git a/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml b/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
index 96edb493e5..d34b1964d0 100644
--- a/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
@@ -7,8 +7,6 @@ import StatusQ.Controls 0.1
 import StatusQ.Components 0.1
 
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/status/core"
 import "../../../../shared/status"
 
 Item {
@@ -35,7 +33,6 @@ Item {
 
     Component {
         id: loadingImageComponent
-        // TODO: replace with StatusQ loading indicator
         StatusLoadingIndicator {}
     }
 
diff --git a/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml b/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
index 7cc8c4167f..3d8800cfd9 100644
--- a/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
@@ -3,8 +3,6 @@ import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.14
 
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/status"
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
diff --git a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
index f2ce5de893..3505f556b7 100644
--- a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
@@ -6,8 +6,6 @@ import StatusQ.Core 0.1
 import StatusQ.Controls 0.1
 
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/status"
 
 Item {
     id: root
diff --git a/ui/app/AppLayouts/Profile/views/SyncView.qml b/ui/app/AppLayouts/Profile/views/SyncView.qml
index a546908590..70b551e120 100644
--- a/ui/app/AppLayouts/Profile/views/SyncView.qml
+++ b/ui/app/AppLayouts/Profile/views/SyncView.qml
@@ -7,10 +7,9 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 
 import utils 1.0
-import "../../../../shared"
+
 import "../../../../shared/controls"
 import "../../../../shared/popups"
-import "../../../../shared/status"
 
 Item {
     id: root
@@ -56,12 +55,9 @@ Item {
             anchors.left: parent.left
             anchors.leftMargin: 24
 
-            // TODO: Replace with StatusQ component
-            StatusRoundButton {
+            StatusFlatRoundButton {
                 id: addButton
-                icon.name: "plusSign"
-                size: "medium"
-                type: "secondary"
+                icon.name: "add"
                 anchors.verticalCenter: parent.verticalCenter
             }
 
@@ -116,7 +112,6 @@ Item {
                     enodeValidationError = "";
                 }
 
-                // TODO: Replace with StatusQ component
                 footer: StatusButton {
                     anchors.right: parent.right
                     anchors.rightMargin: Style.current.smallPadding
@@ -166,7 +161,6 @@ Item {
             anchors.topMargin: 24
         }
 
-        // TODO: Replace with StatusQ component
         StatusSwitch {
             id: automaticSelectionSwitch
             checked: root.store.automaticMailserverSelection
@@ -175,7 +169,6 @@ Item {
             anchors.topMargin: Style.current.padding
             anchors.left: switchLbl.right
             anchors.leftMargin: Style.current.padding
-
         }
 
         StatusBaseText {