diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
index cc11e9e58..47fd4f54c 100644
--- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
+++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
@@ -202,7 +202,7 @@ Rectangle {
 					fill: parent
 					margins: 7
 				}
-				Layout.fillWidth: true
+				width: parent.width - 14
 				icon: 'search'
 				//: 'Search in the list' : ths is a placeholder when searching something in the timeline list
 				placeholderText: qsTr('timelineSearchPlaceholderText')
diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index 6eaa5f1bf..04509b9a9 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -402,22 +402,6 @@ ColumnLayout  {
 		// -------------------------------------------------------------------------
 		// Search.
 		// -------------------------------------------------------------------------
-		Icon {
-					id:searchButton
-					anchors.right: parent.right
-					anchors.top: parent.top
-					anchors.bottom: parent.bottom
-					anchors.rightMargin: 20
-					icon: 'timeline_search'
-					iconSize: searchBar.contentHeight
-					visible: !searchView.visible
-					MouseArea{
-						anchors.fill:parent
-						onClicked:{
-							searchView.visible = !searchView.visible
-						}
-					}
-				}
 		Rectangle{
 			id:searchView
 			anchors.right: parent.right
@@ -425,8 +409,7 @@ ColumnLayout  {
 			anchors.bottom: parent.bottom
 			anchors.left : filterButtons.right
 			anchors.rightMargin: 10
-			anchors.leftMargin: 10
-			visible:false
+			anchors.leftMargin: 80
 			
 			TextField {
 				id:searchBar
@@ -434,13 +417,12 @@ ColumnLayout  {
 					fill: parent
 					margins: 7
 				}
-				Layout.fillWidth: true
+				width: parent.width-14
 				icon: 'search'
 				//: 'Search in messages' : this is a placeholder when searching something in the timeline list
 				placeholderText: qsTr('searchMessagesPlaceholder')
 				
 				onTextChanged: chatRoomProxyModel.filterText = text
-				onIconClicked: searchView.visible = false
 			}
 			
 		}