diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml
index 9ccfeb792b520e5a2707f9cb873afbd88145c787..47d41cfd9736111980dd77dd9bf32e9df80af20d 100644
--- a/src/commoncomponents/SettingParaCombobox.qml
+++ b/src/commoncomponents/SettingParaCombobox.qml
@@ -121,7 +121,7 @@ ComboBox {
         contentItem: JamiListView {
             id: listView
 
-            implicitHeight: popup.contentHeight
+            implicitHeight: contentHeight
             model: root.delegateModel
         }
 
diff --git a/src/commoncomponents/contextmenu/GeneralMenuSeparator.qml b/src/commoncomponents/contextmenu/GeneralMenuSeparator.qml
index 2e1f2f0a6ea21db7ea8a9841041c169c05f2935f..7e012c12748787beb1e818e578d1afd0aac1f294 100644
--- a/src/commoncomponents/contextmenu/GeneralMenuSeparator.qml
+++ b/src/commoncomponents/contextmenu/GeneralMenuSeparator.qml
@@ -36,4 +36,8 @@ MenuSeparator {
         implicitHeight: separatorPreferredHeight
         color: separatorColor
     }
+
+    background: Rectangle {
+        color: JamiTheme.backgroundColor
+    }
 }
diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index fc71dea52ba2accf5cbba5d5a1950c1c14f77ccf..e7d0870675e510f0149407bd42d42db60b6eea78 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -240,7 +240,7 @@ Item {
     property real participantCallInStatusOpacity: 0.77
     property int participantCallInAvatarSize: 60
     property int participantCallInNameFontSize: 11
-    property int participantCallInStatusFontSize: 7
+    property int participantCallInStatusFontSize: 8
     property int participantCallInStatusTextWidthLimit: 80
     property int participantCallInStatusTextWidth: 40
     property int mosaicButtonRadius: 5
diff --git a/src/mainview/components/FilterTabButton.qml b/src/mainview/components/FilterTabButton.qml
index b17cc01358fa9428c5a694892361383c7f373f9c..d21863487e608213a608402bf6e3a04cd1db6c98 100644
--- a/src/mainview/components/FilterTabButton.qml
+++ b/src/mainview/components/FilterTabButton.qml
@@ -28,7 +28,6 @@ import "../../commoncomponents"
 TabButton {
     id: root
 
-    property var tabBar: undefined
     property alias labelText: label.text
     property alias acceleratorSequence: accelerator.sequence
     property alias badgeCount: badge.count
@@ -37,18 +36,18 @@ TabButton {
     hoverEnabled: true
     onClicked: selected()
 
-    Rectangle {
-        id: rect
+     Rectangle {
+        id: contentRect
+
+        anchors.fill: root
 
-        width: tabBar.width / 2 + 1
-        height: tabBar.height
         color: root.hovered ?
                    JamiTheme.hoverColor :
                    JamiTheme.backgroundColor
 
         RowLayout {
-            anchors.horizontalCenter: rect.horizontalCenter
-            anchors.verticalCenter: rect.verticalCenter
+            anchors.horizontalCenter: contentRect.horizontalCenter
+            anchors.verticalCenter: contentRect.verticalCenter
 
             Text {
                 id: label
@@ -70,8 +69,8 @@ TabButton {
     }
 
     Rectangle {
-        width: rect.width
-        anchors.bottom: rect.bottom
+        width: contentRect.width
+        anchors.bottom: contentRect.bottom
         height: 2
         color: root.down ? JamiTheme.textColor : "transparent"
     }
@@ -79,7 +78,7 @@ TabButton {
     Shortcut {
         id: accelerator
         context: Qt.ApplicationShortcut
-        enabled: rect.visible
+        enabled: contentRect.visible
         onActivated: selected()
     }
 }
diff --git a/src/mainview/components/MessageBarTextArea.qml b/src/mainview/components/MessageBarTextArea.qml
index cca9a08c5d282627432a330a436caad83db928d3..be7fad34de1de92dea7785f61f465197ab34528d 100644
--- a/src/mainview/components/MessageBarTextArea.qml
+++ b/src/mainview/components/MessageBarTextArea.qml
@@ -57,23 +57,16 @@ JamiFlickable {
         }
     }
 
-    contentWidth: width
-    contentHeight: textArea.implicitHeight
-
     interactive: true
     attachedFlickableMoving: contentHeight > height || root.moving
 
-    function ensureVisible(r) {
-        if (contentY >= r.y)
-            contentY = r.y
-        else if (contentY + height <= r.y + r.height)
-            contentY = r.y + r.height - height
-    }
-
     TextArea.flickable: TextArea {
         id: textArea
 
-        padding: 0
+        leftPadding: JamiTheme.scrollBarHandleSize
+        rightPadding: JamiTheme.scrollBarHandleSize
+        topPadding: 0
+        bottomPadding: 0
 
         verticalAlignment: TextEdit.AlignVCenter
 
@@ -81,7 +74,6 @@ JamiFlickable {
         font.hintingPreference: Font.PreferNoHinting
 
         color: JamiTheme.textColor
-        renderType: Text.NativeRendering
         wrapMode: TextEdit.Wrap
         selectByMouse: true
         selectionColor: JamiTheme.placeholderTextColor
@@ -109,13 +101,14 @@ JamiFlickable {
                 }
             }
         }
+
         background: Rectangle {
             border.width: 0
             color: JamiTheme.transparentColor
         }
 
         onReleased: function (event) {
-            if (event.button == Qt.RightButton)
+            if (event.button === Qt.RightButton)
                 textAreaContextMenu.openMenuAt(event)
         }
 
@@ -142,7 +135,5 @@ JamiFlickable {
                 }
             }
         }
-
-        onCursorRectangleChanged: root.ensureVisible(cursorRectangle)
     }
 }
diff --git a/src/mainview/components/ParticipantCallInStatusDelegate.qml b/src/mainview/components/ParticipantCallInStatusDelegate.qml
index e576f8d16ab90130acb05c6ecd0135705f0076bd..d291eab93599ccefe5bb49d11f74f69e530c39cd 100644
--- a/src/mainview/components/ParticipantCallInStatusDelegate.qml
+++ b/src/mainview/components/ParticipantCallInStatusDelegate.qml
@@ -120,10 +120,7 @@ SpinningAnimation {
             anchors.rightMargin: 10
             anchors.verticalCenter: contentRect.verticalCenter
 
-            width: 40
-            height: 40
-            // To control the size of the svg
-            preferredSize: 50
+            preferredSize: 40
 
             pressedColor: JamiTheme.refuseRed
             hoveredColor: JamiTheme.refuseRed
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index dbdb6a1ef5c5da149b80e5365f7f43e88a53fb19..35c85b84d67b1d8adaf5b5b0ebfe8e3e23eb79c1 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -94,6 +94,7 @@ Rectangle {
         anchors.topMargin: visible ? 10 : 0
         width: sidePanelRect.width
         height: visible ? 42 : 0
+        contentHeight: visible ? 42 : 0
     }
 
     Rectangle {
@@ -145,7 +146,7 @@ Rectangle {
             id: searchResultsListView
 
             visible: count
-            opacity: visible ? 1 :0
+            opacity: visible ? 1 : 0
 
             Layout.topMargin: 10
             Layout.alignment: Qt.AlignTop
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index 4020a11f6196d680c0765d12bccef02808627bf2..252f4bdbb3be1441dd6da8988f200afd9d92da78 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -28,8 +28,6 @@ import "../../commoncomponents"
 TabBar {
     id: tabBar
 
-    currentIndex: 0
-
     enum TabIndex {
         Conversations,
         Requests
@@ -39,11 +37,12 @@ TabBar {
         ConversationsAdapter.filterRequests = (idx === SidePanelTabBar.Requests)
     }
 
+    currentIndex: 0
+
     FilterTabButton {
         id: conversationsTabButton
 
         down: !ConversationsAdapter.filterRequests
-        tabBar: parent
         labelText: JamiStrings.conversations
         onSelected: selectTab(SidePanelTabBar.Conversations)
         badgeCount: ConversationsAdapter.totalUnreadMessageCount
@@ -54,7 +53,6 @@ TabBar {
         id: requestsTabButton
 
         down: !conversationsTabButton.down
-        tabBar: parent
         labelText: JamiStrings.invitations
         onSelected: selectTab(SidePanelTabBar.Requests)
         badgeCount: ConversationsAdapter.pendingRequestCount
diff --git a/src/mainview/components/SmartListItemDelegate.qml b/src/mainview/components/SmartListItemDelegate.qml
index 56f0049147d7e2a02e898e61efd98e57d8444bf8..c3ab595b928abae3174adfbe6268bc03a5bba270 100644
--- a/src/mainview/components/SmartListItemDelegate.qml
+++ b/src/mainview/components/SmartListItemDelegate.qml
@@ -130,13 +130,13 @@ ItemDelegate {
         }
 
         ColumnLayout {
-            visible: (InCall || UnreadMessagesCount) && !ReadOnly
-            Layout.preferredWidth: childrenRect.width
             Layout.fillHeight: true
             spacing: 2
 
             // call status
             Text {
+                id: callStatusText
+
                 Layout.preferredHeight: 20
                 Layout.alignment: Qt.AlignRight
                 text: InCall ? UtilsAdapter.getCallStatusStr(CallState) : ""