diff --git a/ui/imports/shared/panels/chat/ChatTimePanel.qml b/ui/imports/shared/panels/chat/ChatTimePanel.qml
deleted file mode 100644
index a9f66e031dc..00000000000
--- a/ui/imports/shared/panels/chat/ChatTimePanel.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 2.14
-import shared 1.0
-import shared.panels 1.0
-import shared.stores 1.0
-
-import StatusQ.Controls 0.1 as StatusQ
-import utils 1.0
-
-StyledText {
-    id: chatTime
-
-    property string timestamp
-
-    color: Style.current.secondaryText
-    text: Utils.formatShortTime(parseInt(chatTime.timestamp, 10), RootStore.accountSensitiveSettings.is24hTimeFormat)
-    font.pixelSize: Style.current.asideTextFontSize
-
-    StatusQ.StatusToolTip {
-        visible: hhandler.hovered
-        text: Utils.formatLongDateTime(parseInt(chatTime.timestamp, 10), RootStore.accountSensitiveSettings.isDDMMYYDateFormat, RootStore.accountSensitiveSettings.is24hTimeFormat)
-        maxWidth: 350
-    }
-
-    HoverHandler {
-        id: hhandler
-    }
-}
diff --git a/ui/imports/shared/panels/chat/qmldir b/ui/imports/shared/panels/chat/qmldir
deleted file mode 100644
index 94f94d983f5..00000000000
--- a/ui/imports/shared/panels/chat/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-ChatTimePanel 1.0 ChatTimePanel.qml
diff --git a/ui/shared/status/StatusIconTabButton.qml b/ui/shared/status/StatusIconTabButton.qml
deleted file mode 100644
index e0622c1d6ae..00000000000
--- a/ui/shared/status/StatusIconTabButton.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtGraphicalEffects 1.13
-
-import utils 1.0
-import "../../shared"
-import "../../shared/panels"
-import "../../shared/status"
-
-TabButton {
-    id: control
-    visible: enabled
-    width: 40
-    height: enabled ? 40 : 0
-    anchors.horizontalCenter: parent.horizontalCenter
-    property color iconColor: Style.current.secondaryText
-    property color disabledColor: iconColor
-    property int iconRotation: 0
-    property string iconSource
-    property string section
-    property bool doNotHandleClick: false
-    property bool borderOnChecked: false
-    property bool useLetterIdenticon: false
-    property string name: ""
-
-    onClicked: {
-        if (doNotHandleClick) {
-            return
-        }
-
-        // Not Refactored Yet
-//        chatsModel.communities.activeCommunity.active = false
-        Global.changeAppSectionBySectionType(section)
-    }
-
-    icon.height: 24
-    icon.width: 24
-    icon.color: {
-        if (!enabled) {
-            return control.disabledColor
-        }
-        return (hovered || checked) ? Style.current.blue : control.iconColor
-    }
-
-    onIconChanged: {
-        if (iconSource) {
-            icon.source = iconSource
-            return
-        }
-
-        icon.source = icon.name ? Style.svg(icon.name) : ""
-    }
-
-    contentItem: Item {
-        anchors.fill: parent
-
-        Loader {
-            active: true
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            sourceComponent: useLetterIdenticon ? letterIdenticon :
-              !!iconSource ? imageIcon : defaultIcon
-        }
-
-        Component {
-            id: defaultIcon
-            SVGImage {
-                id: iconImg
-                source: control.icon.source
-                height: control.icon.height
-                width: control.icon.width
-                fillMode: Image.PreserveAspectFit
-                rotation: control.iconRotation
-                ColorOverlay {
-                    anchors.fill: iconImg
-                    source: iconImg
-                    color: control.icon.color
-                    antialiasing: true
-                    smooth: true
-                }
-            }
-        }
-
-        Component {
-            id: imageIcon
-            RoundedImage {
-                source: iconSource
-                noMouseArea: true
-            }
-        }
-
-        Component {
-            id: letterIdenticon
-            StatusLetterIdenticon {
-                width: 26
-                height: 26
-                letterSize: 15
-                chatName: control.name
-                color: control.iconColor
-            }
-        }
-    }
-
-    background: Rectangle {
-        color: hovered || (borderOnChecked && checked) ? Style.current.tabButtonBg : "transparent"
-        border.color: Style.current.primary
-        border.width: borderOnChecked && checked ? 1 : 0
-        radius: control.width / 2
-    }
-
-    MouseArea {
-        cursorShape: Qt.PointingHandCursor
-        anchors.fill: parent
-        onPressed: mouse.accepted = false
-    }
-}