diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 3b86da049..b2b39acbf 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -192,7 +192,7 @@ ApplicationWindow {
 						id: smartSearchBar
 						
 						Layout.fillWidth: true
-						Layout.maximumWidth: parent.width - telKeypad.width - x
+						
 						
 						maxMenuHeight: MainWindowStyle.searchBox.maxHeight
 						placeholderText: qsTr('mainSearchBarPlaceholder')
@@ -226,8 +226,14 @@ ApplicationWindow {
 						}
 						onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress, '')
 					}
+					Item{
+						Layout.preferredWidth: telKeypad.width - 30
+												- (keypadButton.visible ? keypadButton.width : 0)
+												- (newChatGroupButton.visible ? newChatGroupButton.width : 0)
+												- 4 * MainWindowStyle.toolBar.spacing
+					}
 					ActionButton {
-						Layout.leftMargin: 30
+						id: keypadButton
 						isCustom: true
 						backgroundRadius: 90
 						colorSet: MainWindowStyle.buttons.telKeyad
@@ -235,6 +241,7 @@ ApplicationWindow {
 						toggled: telKeypad.visible
 					}					
 					ActionButton {
+						id: newChatGroupButton
 						isCustom: true
 						backgroundRadius: 4
 						colorSet: MainWindowStyle.buttons.newChatGroup
@@ -258,6 +265,7 @@ ApplicationWindow {
 					}
 					
 					ActionButton {
+						id:newConferenceButton
 						isCustom: true
 						backgroundRadius: 4
 						colorSet: MainWindowStyle.buttons.newConference
diff --git a/linphone-sdk b/linphone-sdk
index 11a703d3d..d6fc9fb33 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 11a703d3d8ef46701eeca02d9d0e7e1b9cdae828
+Subproject commit d6fc9fb3338622a74fe8fe2121fe2d80df6ab560