diff --git a/storybook/pages/ActivityNotificationTransferOwnershipPage.qml b/storybook/pages/ActivityNotificationTransferOwnershipPage.qml
index fefd6301f29..683eca74878 100644
--- a/storybook/pages/ActivityNotificationTransferOwnershipPage.qml
+++ b/storybook/pages/ActivityNotificationTransferOwnershipPage.qml
@@ -14,8 +14,6 @@ import utils
 ActivityNotificationBaseLayout {
     id: root
 
-    property bool showFullTimestamp
-
     showBaseEditorFields: false
     communityEditorActive: true
     contactEditorActive: false
@@ -24,7 +22,6 @@ ActivityNotificationBaseLayout {
         type: setType(notification)
         communityName: communityEditor.communityMock.name
         communityColor:  communityEditor.communityMock.color
-        showFullTimestamp: root.showFullTimestamp
 
         onFinaliseOwnershipClicked: logs.logEvent("ActivityNotificationTransferOwnership::onFinaliseOwnershipClicked")
         onNavigateToCommunityClicked: logs.logEvent("ActivityNotificationTransferOwnership::onNavigateToCommunityClicked")
@@ -58,12 +55,6 @@ ActivityNotificationBaseLayout {
                 text: "No longer control node"
                 onCheckedChanged: if(checked) baseEditor.notificationBaseMock.notificationType = ActivityCenterTypes.ActivityCenterNotificationType.OwnershipLost
             }
-
-            Switch {
-                text: "Show full timestamp"
-                checked: root.showFullTimestamp
-                onCheckedChanged: root.showFullTimestamp = checked
-            }
         }
 
     }
diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
index 825d3fcf1a9..e79e0f3c382 100644
--- a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
+++ b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
@@ -267,7 +267,6 @@ Control {
                             onClicked: (sender) => root.senderNameClicked(sender)
                             onResendClicked: root.resendClicked()
                             timestamp: root.timestamp
-                            showFullTimestamp: root.isInPinnedPopup
                             displayNameClickable: root.profileClickable
                             outgoingStatus: root.outgoingStatus
                             showOutgointStatusLabel: root.hovered && !root.isInPinnedPopup
@@ -383,7 +382,7 @@ Control {
 
                     Loader {
                         Layout.fillWidth: true
-                        Layout.rightMargin: 16
+                        Layout.rightMargin: Theme.padding
                         active: root.editMode
                         visible: active
                         sourceComponent: StatusEditMessage {
@@ -418,7 +417,7 @@ Control {
             active: root.hovered && root.quickActions.length > 0
             anchors.right: parent.right
             anchors.rightMargin: Theme.padding
-            anchors.top: root.top
+            anchors.top: parent.top
             sourceComponent: StatusMessageQuickActions {
                 items: root.quickActions
             }
diff --git a/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationTransferOwnership.qml b/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationTransferOwnership.qml
index 36b886daf5c..12645a4fc60 100644
--- a/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationTransferOwnership.qml
+++ b/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationTransferOwnership.qml
@@ -23,7 +23,6 @@ ActivityNotificationBase {
     required property string communityName
     required property string communityColor
     required property int type // Possible values [OwnershipState]
-    property bool showFullTimestamp: false
 
     signal finaliseOwnershipClicked
     signal navigateToCommunityClicked
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
index 19eceb337ed..3ff40d88676 100644
--- a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -116,8 +116,8 @@ Item {
 
     Connections {
         target: Qt.application
-        onStateChanged: {
-            if (Qt.application.state == Qt.ApplicationActive) {
+        function onStateChanged() {
+            if (Qt.application.state === Qt.ApplicationActive) {
                 d.markAllMessagesReadIfMostRecentMessageIsInViewport()
             }
         }
diff --git a/ui/app/mainui/AppSearch.qml b/ui/app/mainui/AppSearch.qml
index 21f2c5db2d0..4e0b5461609 100644
--- a/ui/app/mainui/AppSearch.qml
+++ b/ui/app/mainui/AppSearch.qml
@@ -84,7 +84,7 @@ Item {
         searchOptionsPopupMenu: searchPopupMenu
         searchResults: root.store.resultModel
         formatTimestampFn: function (ts) {
-            return LocaleUtils.formatDateTime(parseInt(ts, 10))
+            return LocaleUtils.formatDateTime(parseInt(ts, 10), Locale.ShortFormat)
         }
         onSearchTextChanged: {
             if (searchPopup.searchText !== "") {
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 322d48af941..8ab4a799b2f 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -694,7 +694,6 @@ Loader {
                 StatusTimeStampLabel {
                     Layout.alignment: Qt.AlignVCenter
                     timestamp: root.messageTimestamp
-                    showFullTimestamp: false
                 }
             }
         }