diff --git a/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
index ea0f3f9471..53daedff67 100644
--- a/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
+++ b/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
@@ -1,9 +1,11 @@
 import QtQuick 2.13
 import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import QtGraphicalEffects 1.13
 import "../../../shared"
 import "../../../shared/status"
 import "../../../imports"
+import "../Wallet"
 
 Popup {
     id: popup
@@ -78,12 +80,12 @@ Popup {
         property string currentAddress: ""
         id: accountSelectorRow
         width: parent.width
-        height: 44
+        height: accountSelector.height
         anchors.top: walletHeader.bottom
         anchors.topMargin: Style.current.bigPadding
 
         AccountSelector {
-            id: accountRow
+            id: accountSelector
             label: ""
             anchors.left: parent.left
             anchors.right: copyBtn.left
@@ -121,7 +123,7 @@ Popup {
             anchors.right: sendBtn.left
             anchors.rightMargin: Style.current.padding
             anchors.verticalCenter: parent.verticalCenter
-            textToCopy: accountRow.selectedAccount.address
+            textToCopy: accountSelector.selectedAccount.address
         }
 
         StatusIconButton {
@@ -135,4 +137,55 @@ Popup {
             onClicked: console.log("Send Tx")
         }
     }
+
+    Item {
+        id: walletInfoContent
+        width: parent.width
+        anchors.top: accountSelectorRow.bottom
+        anchors.topMargin: Style.current.bigPadding
+        anchors.bottom: parent.bottom
+
+        TabBar {
+            id: walletTabBar
+            width: parent.width
+            anchors.top: parent.top
+            height: assetBtn.height
+            background: Rectangle {
+                color: Style.current.transparent
+                border.width: 0
+            }
+
+            StatusTabButton {
+                id: assetBtn
+                //% "Assets"
+                btnText: qsTrId("wallet-assets")
+                anchors.top: parent.top
+            }
+            StatusTabButton {
+                id: historyBtn
+                anchors.top: parent.top
+                anchors.left: assetBtn.right
+                anchors.leftMargin: 32
+                //% "History"
+                btnText: qsTrId("history")
+                onClicked: historyTab.checkIfHistoryIsBeingFetched()
+            }
+        }
+
+        StackLayout {
+            id: stackLayout
+            width: parent.width
+            anchors.top: walletTabBar.bottom
+            anchors.topMargin: Style.current.bigPadding
+            anchors.bottom: parent.bottom
+            currentIndex: walletTabBar.currentIndex
+
+            AssetsTab {
+                id: assetsTab
+            }
+            HistoryTab {
+                id: historyTab
+            }
+        }
+    }
 }
diff --git a/ui/app/AppLayouts/Wallet/AssetsTab.qml b/ui/app/AppLayouts/Wallet/AssetsTab.qml
index 284ca7788a..fa1e694301 100644
--- a/ui/app/AppLayouts/Wallet/AssetsTab.qml
+++ b/ui/app/AppLayouts/Wallet/AssetsTab.qml
@@ -3,15 +3,14 @@ import "../../../imports"
 import "../../../shared"
 
 Item {
+    height: assetListView.height
     Component {
         id: assetViewDelegate
 
         Item {
             id: element
             anchors.right: parent.right
-            anchors.rightMargin: 0
             anchors.left: parent.left
-            anchors.leftMargin: 0
             height: 40
 
             Image {
@@ -82,7 +81,7 @@ Item {
 
     ListView {
         id: assetListView
-        anchors.topMargin: 20
+        spacing: Style.current.halfPadding
         anchors.fill: parent
 //        model: exampleModel
         model: walletModel.assets
diff --git a/ui/shared/StatusTabButton.qml b/ui/shared/StatusTabButton.qml
index 7bbfa6576d..c4fa94f434 100644
--- a/ui/shared/StatusTabButton.qml
+++ b/ui/shared/StatusTabButton.qml
@@ -12,7 +12,7 @@ TabButton {
     padding: 0
     background: Rectangle {
         color: Style.current.transparent
-        border.color: Style.current.transparent
+        border.width: 0
     }
 
     StyledText {