diff --git a/src/app/mainview/components/AccountComboBox.qml b/src/app/mainview/components/AccountComboBox.qml
index 48ff40bf4207a285f51fbdd13b2587a4d74d729f..180b818d5424ea001db5100d4c72ec9df14de743 100644
--- a/src/app/mainview/components/AccountComboBox.qml
+++ b/src/app/mainview/components/AccountComboBox.qml
@@ -79,7 +79,7 @@ Label {
     RowLayout {
         id: mainLayout
         anchors.fill: parent
-        anchors.leftMargin: 15
+        anchors.leftMargin: 5
         anchors.rightMargin: 15
         spacing: 10
 
@@ -103,7 +103,7 @@ Label {
 
             RowLayout {
                 anchors.fill: parent
-                anchors.leftMargin: 15
+                anchors.leftMargin: 10
                 anchors.rightMargin: 15
 
                 spacing: 10
@@ -124,15 +124,12 @@ Label {
                 ColumnLayout {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    Layout.topMargin: 15
-                    Layout.bottomMargin: 10
-                    spacing: 5
+                    spacing: 2
 
                     Text {
                         id: bestNameText
 
                         Layout.fillWidth: true
-                        Layout.fillHeight: true
                         Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
 
                         text: CurrentAccount.bestName
@@ -148,8 +145,7 @@ Label {
                         id: bestIdText
 
                         Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
+                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
 
                         visible: text.length && text !== bestNameText.text
 
@@ -160,7 +156,6 @@ Label {
                         color: JamiTheme.faddedLastInteractionFontColor
                         elide: Text.ElideRight
                         horizontalAlignment: Text.AlignLeft
-                        verticalAlignment: Text.AlignBottom
                     }
                 }
             }
diff --git a/src/app/mainview/components/AccountComboBoxPopup.qml b/src/app/mainview/components/AccountComboBoxPopup.qml
index 48585085aa0d3394239c9610be1a7c6a4373e38e..d9e10e0caf6a55560d02a1f3be820151ba51b0a0 100644
--- a/src/app/mainview/components/AccountComboBoxPopup.qml
+++ b/src/app/mainview/components/AccountComboBoxPopup.qml
@@ -53,7 +53,7 @@ Popup {
         Rectangle {
             id: comboBox
 
-            height: JamiTheme.accountListItemHeight
+            height: JamiTheme.accountListItemHeight - 5
             Layout.fillWidth: true
             radius: 5
             color: JamiTheme.accountComboBoxBackgroundColor
@@ -83,13 +83,11 @@ Popup {
                 spacing: 10
 
                 Rectangle {
+                    id: accountInfoRect
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    Layout.rightMargin: 5
-                    Layout.leftMargin: 5
                     color: mouseArea.containsMouse ? JamiTheme.hoverColor : JamiTheme.accountComboBoxBackgroundColor
                     radius: 5
-                    Layout.topMargin: 5
 
                     MouseArea {
                         id: mouseArea
@@ -163,7 +161,8 @@ Popup {
 
                     Layout.preferredWidth: childrenRect.width
                     Layout.preferredHeight: parent.height
-                    Layout.rightMargin: 7
+                    Layout.rightMargin: 10
+                    Layout.topMargin: -7
 
                     JamiPushButton {
                         id: shareButton