diff --git a/ui/StatusQ/sandbox/main.qml b/ui/StatusQ/sandbox/main.qml
index 294e5ac329..f4676819c8 100644
--- a/ui/StatusQ/sandbox/main.qml
+++ b/ui/StatusQ/sandbox/main.qml
@@ -185,11 +185,6 @@ StatusWindow {
                         selected: viewLoader.source.toString().includes(title)
                         onClicked: mainPageView.page("StatusTabSwitch");
                     }
-                    StatusNavigationListItem {
-                        title: "StatusChatCommandButton"
-                        selected: viewLoader.source.toString().includes(title)
-                        onClicked: mainPageView.page(title);
-                    }
                     StatusNavigationListItem {
                         title: "Controls"
                         selected: viewLoader.source.toString().includes(title)
diff --git a/ui/StatusQ/sandbox/pages/StatusChatCommandButtonPage.qml b/ui/StatusQ/sandbox/pages/StatusChatCommandButtonPage.qml
deleted file mode 100644
index 3f4bd2ddf6..0000000000
--- a/ui/StatusQ/sandbox/pages/StatusChatCommandButtonPage.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-
-Column {
-    spacing: 8
-
-    StatusChatCommandButton {
-        icon.name: "send"
-        icon.color: Theme.palette.miscColor2
-        text: "Send transaction"
-    }
-
-    StatusChatCommandButton {
-        icon.name: "send"
-        icon.rotation: 180
-        icon.color: Theme.palette.miscColor8
-        text: "Receive transaction"
-    }
-}
diff --git a/ui/StatusQ/sandbox/qml.qrc b/ui/StatusQ/sandbox/qml.qrc
index bb40e4500b..cec3fd22cf 100644
--- a/ui/StatusQ/sandbox/qml.qrc
+++ b/ui/StatusQ/sandbox/qml.qrc
@@ -44,7 +44,6 @@
         <file>images/SuperRareCommunityBanner.png</file>
         <file>pages/StatusAddressPage.qml</file>
         <file>pages/StatusCardPage.qml</file>
-        <file>pages/StatusChatCommandButtonPage.qml</file>
         <file>pages/StatusChatInfoToolBarPage.qml</file>
         <file>pages/StatusColorSelectorGridPage.qml</file>
         <file>pages/StatusColorSelectorPage.qml</file>
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusChatCommandButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusChatCommandButton.qml
deleted file mode 100644
index 66d66baae1..0000000000
--- a/ui/StatusQ/src/StatusQ/Controls/StatusChatCommandButton.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Components 0.1
-
-Rectangle {
-    id: root
-    implicitWidth: 168
-    implicitHeight: 95
-
-    property string text: ""
-    property bool highlighted: false
-    property bool enabled: true
-
-    signal clicked(var mouse)
-
-    property StatusAssetSettings icon: StatusAssetSettings {
-        width: 24
-        height: 24
-    }
-
-    color: {
-        let actualColor = Qt.darker(root.icon.color, 1)
-        actualColor.a = sensor.containsMouse && enabled ? 0.3 : 0.2
-        return actualColor
-    }
-
-    radius: 16
-
-    MouseArea {
-        id: sensor
-        cursorShape: root.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-        anchors.fill: parent
-        hoverEnabled: true
-
-        onClicked: function (mouse) {
-            root.clicked(mouse)
-        }
-
-        StatusRoundIcon {
-            asset.name: root.icon.name
-            asset.width: root.icon.width
-            asset.height: root.icon.height
-            asset.rotation: root.icon.rotation
-            asset.color: Theme.palette.white
-            asset.bgWidth: 40
-            asset.bgHeight: 40
-            asset.bgColor: root.icon.color
-            anchors.top: parent.top
-            anchors.topMargin: 8
-            anchors.left: parent.left
-            anchors.leftMargin: 8
-        }
-
-        StatusBaseText {
-            text: root.text
-            anchors.left: parent.left
-            anchors.leftMargin: 8
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 8
-            font.pixelSize: 13
-            font.weight: Font.Medium
-            color: Theme.palette.directColor1
-        }
-    }
-}
-
-
diff --git a/ui/StatusQ/src/StatusQ/Controls/qmldir b/ui/StatusQ/src/StatusQ/Controls/qmldir
index fc505dcccd..0d5757d341 100644
--- a/ui/StatusQ/src/StatusQ/Controls/qmldir
+++ b/ui/StatusQ/src/StatusQ/Controls/qmldir
@@ -9,7 +9,6 @@ StatusBaseInput 0.1 StatusBaseInput.qml
 StatusBlockProgressBar 0.1 StatusBlockProgressBar.qml
 StatusButton 0.1 StatusButton.qml
 StatusButtonRow 0.1 StatusButtonRow.qml
-StatusChatCommandButton 0.1 StatusChatCommandButton.qml
 StatusChatInfoButton 0.1 StatusChatInfoButton.qml
 StatusChatListCategoryItemButton 0.1 StatusChatListCategoryItemButton.qml
 StatusCheckBox 0.1 StatusCheckBox.qml
diff --git a/ui/StatusQ/src/statusq.qrc b/ui/StatusQ/src/statusq.qrc
index d24b5d6220..9020d17de6 100644
--- a/ui/StatusQ/src/statusq.qrc
+++ b/ui/StatusQ/src/statusq.qrc
@@ -99,7 +99,6 @@
         <file>StatusQ/Controls/StatusBlockProgressBar.qml</file>
         <file>StatusQ/Controls/StatusButton.qml</file>
         <file>StatusQ/Controls/StatusButtonRow.qml</file>
-        <file>StatusQ/Controls/StatusChatCommandButton.qml</file>
         <file>StatusQ/Controls/StatusChatInfoButton.qml</file>
         <file>StatusQ/Controls/StatusChatListCategoryItemButton.qml</file>
         <file>StatusQ/Controls/StatusCheckBox.qml</file>
diff --git a/ui/imports/shared/popups/ChatCommandsPopup.qml b/ui/imports/shared/popups/ChatCommandsPopup.qml
deleted file mode 100644
index d9cd2bc1ea..0000000000
--- a/ui/imports/shared/popups/ChatCommandsPopup.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtGraphicalEffects 1.13
-
-import utils 1.0
-import shared.popups 1.0
-import shared.stores 1.0
-
-import StatusQ.Controls 0.1
-
-Dialog {
-    id: root
-    width: buttonRow.width
-    height: buttonRow.height
-    padding: 0
-    margins: 0
-    closePolicy: Popup.CloseOnReleaseOutside | Popup.CloseOnEscape
-
-    signal sendTransactionCommandButtonClicked()
-    signal receiveTransactionCommandButtonClicked()
-
-    background: Rectangle {
-        color: Style.current.background
-        radius: Style.current.radius
-        border.width: 0
-        layer.enabled: true
-        layer.effect: DropShadow {
-            verticalOffset: 3
-            radius: 8
-            samples: 15
-            fast: true
-            cached: true
-            color: "#22000000"
-        }
-    }
-
-    Row {
-        id: buttonRow
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.top: parent.top
-        anchors.topMargin: 0
-        padding: Style.current.halfPadding
-        spacing: Style.current.halfPadding
-
-        StatusChatCommandButton {
-            text: qsTr("Send transaction")
-            icon.color: Style.current.purple
-            icon.name: "send"
-            // this flow doesnt work, commenting it out till it is worked on
-//            onClicked: root.sendTransactionCommandButtonClicked()
-        }
-
-
-        StatusChatCommandButton {
-            text: qsTr("Request transaction")
-            icon.color: Style.current.orange
-            icon.name: "send"
-            icon.rotation: 180
-            // this flow doesnt work, commenting it out till it is worked on
-//            onClicked: root.receiveTransactionCommandButtonClicked()
-        }
-    }
-}
diff --git a/ui/imports/shared/popups/qmldir b/ui/imports/shared/popups/qmldir
index c4421c5613..aee8725b43 100644
--- a/ui/imports/shared/popups/qmldir
+++ b/ui/imports/shared/popups/qmldir
@@ -1,6 +1,5 @@
 AlertPopup 1.0 AlertPopup.qml
 BlockContactConfirmationDialog 1.0 BlockContactConfirmationDialog.qml
-ChatCommandsPopup 1.0 ChatCommandsPopup.qml
 CommonContactDialog 1.0 CommonContactDialog.qml
 CommunityAssetsInfoPopup 1.0 CommunityAssetsInfoPopup.qml
 CommunityMembershipSetupDialog 1.0 CommunityMembershipSetupDialog.qml
@@ -11,11 +10,13 @@ DeleteMessageConfirmationPopup 1.0 DeleteMessageConfirmationPopup.qml
 DownloadModal 1.0 DownloadModal.qml
 DownloadPage 1.0 DownloadPage.qml
 GetSyncCodeInstructionsPopup 1.0 GetSyncCodeInstructionsPopup.qml
+ImageContextMenu 1.0 ImageContextMenu.qml
 ImageCropWorkflow 1.0 ImageCropWorkflow.qml
 ImportCommunityPopup 1.0 ImportCommunityPopup.qml
 InviteFriendsPopup 1.0 InviteFriendsPopup.qml
 MarkAsIDVerifiedDialog 1.0 MarkAsIDVerifiedDialog.qml
 MarkAsUntrustedPopup 1.0 MarkAsUntrustedPopup.qml
+MetricsEnablePopup 1.0 MetricsEnablePopup.qml
 ModalPopup 1.0 ModalPopup.qml
 NicknamePopup 1.0 NicknamePopup.qml
 NoPermissionsToJoinPopup 1.0 NoPermissionsToJoinPopup.qml
@@ -31,6 +32,4 @@ SendContactRequestModal 1.0 SendContactRequestModal.qml
 SettingsDirtyToastMessage 1.0 SettingsDirtyToastMessage.qml
 UnblockContactConfirmationDialog 1.0 UnblockContactConfirmationDialog.qml
 UserAgreementPopup 1.0 UserAgreementPopup.qml
-MetricsEnablePopup 1.0 MetricsEnablePopup.qml
 UserStatusContextMenu 1.0 UserStatusContextMenu.qml
-ImageContextMenu 1.0 ImageContextMenu.qml