diff --git a/ui/StatusQ b/ui/StatusQ
index 2a377533f8c..e47bfa3657c 160000
--- a/ui/StatusQ
+++ b/ui/StatusQ
@@ -1 +1 @@
-Subproject commit 2a377533f8c2d49a8a904c36713fb623972980b7
+Subproject commit e47bfa3657cabba97d9643c4afbd7075f8a561e6
diff --git a/ui/app/AppLayouts/Profile/views/wallet/AccountView.qml b/ui/app/AppLayouts/Profile/views/wallet/AccountView.qml
index 3e267e97af7..74a07312525 100644
--- a/ui/app/AppLayouts/Profile/views/wallet/AccountView.qml
+++ b/ui/app/AppLayouts/Profile/views/wallet/AccountView.qml
@@ -74,9 +74,14 @@ Item {
                         onClicked: Global.openPopup(renameAccountModalComponent)
                     }
                 }
-                StatusAddress {
-                    text: walletStore.currentAccount.address
-                    font.pixelSize: 15
+                StatusAddressPanel {
+                    address: walletStore.currentAccount.address
+
+                    font.weight: Font.Normal
+
+                    showFrame: false
+
+                    onDoCopy: (address) => globalUtils.copyToClipboard(address)
                 }
             }
         }
diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
index b28a6c96ba8..692a3e047ec 100644
--- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import StatusQ.Core 0.1
 import StatusQ.Controls 0.1
+import StatusQ.Components 0.1
 import StatusQ.Core.Theme 0.1
 
 import utils 1.0
@@ -56,40 +57,13 @@ Item {
             store: root.walletStore
         }
 
-        // account address button
-        Button {
-            horizontalPadding: Style.current.halfPadding
-            verticalPadding: 5
-            Layout.preferredWidth: 150
-            background: Rectangle {
-                implicitWidth: 150
-                implicitHeight: 32
-                color: "transparent"
-                border.width: 1
-                border.color: Theme.palette.baseColor2
-                radius: 36
-            }
+        StatusAddressPanel {
+            address: currentAccount.mixedcaseAddress
 
-            contentItem: RowLayout {
-                spacing: 4
-                StatusIcon {
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.preferredWidth: 22
-                    Layout.preferredHeight: 22
-                    icon: "address"
-                    color: Theme.palette.baseColor2
-                }
-                StatusBaseText {
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.fillWidth: true
-                    text: currentAccount.mixedcaseAddress
-                    color: Theme.palette.directColor5
-                    elide: Text.ElideMiddle
-                    font.pixelSize: Style.current.primaryTextFontSize
-                    font.weight: Font.Medium
-                }
-            }
-            onClicked: store.copyToClipboard(currentAccount.mixedcaseAddress)
+            autHideCopyIcon: true
+            expanded: false
+
+            onDoCopy: (address) => root.store.copyToClipboard(address)
         }
     }
 }