diff --git a/Linphone/view/Control/Button/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml
index f671f8cfe..c4eba3189 100644
--- a/Linphone/view/Control/Button/CalendarComboBox.qml
+++ b/Linphone/view/Control/Button/CalendarComboBox.qml
@@ -21,7 +21,7 @@ ComboBox {
 		verticalAlignment: Text.AlignVCenter
 		font {
             pixelSize: Utils.getSizeWithScreenRatio(14)
-            weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
+            weight: Font.Bold
 		}
 	}
 	popup: Control.Popup {
diff --git a/Linphone/view/Control/Button/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml
index 1dd66ca8c..5175ffc3d 100644
--- a/Linphone/view/Control/Button/ComboBox.qml
+++ b/Linphone/view/Control/Button/ComboBox.qml
@@ -223,7 +223,7 @@ Control.ComboBox {
                         font {
                             family: DefaultStyle.defaultFont
                             pixelSize: Utils.getSizeWithScreenRatio(15)
-                            weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
+                            weight: Font.Normal
                         }
                     }
                 }
diff --git a/Linphone/view/Control/Tool/Helper/utils.js b/Linphone/view/Control/Tool/Helper/utils.js
index 79011e8a7..683e34ef5 100644
--- a/Linphone/view/Control/Tool/Helper/utils.js
+++ b/Linphone/view/Control/Tool/Helper/utils.js
@@ -876,4 +876,4 @@ function getSizeWithScreenRatio(size){
     : size > 0 
       ? Math.max(Math.round(size * Linphone.DefaultStyle.dp), 1)
       : Math.min(Math.round(size * Linphone.DefaultStyle.dp), -1);
-}
\ No newline at end of file
+}
diff --git a/Linphone/view/Page/Form/Meeting/MeetingForm.qml b/Linphone/view/Page/Form/Meeting/MeetingForm.qml
index b50d307f5..18cdad514 100644
--- a/Linphone/view/Page/Form/Meeting/MeetingForm.qml
+++ b/Linphone/view/Page/Form/Meeting/MeetingForm.qml
@@ -108,7 +108,7 @@ FocusScope {
 						id: startDate
 						background.visible: mainItem.isCreation
 						indicator.visible: mainItem.isCreation
-                        contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
+                        contentText.font.weight: isCreation ? Font.Bold : Font.Normal
 						Layout.fillWidth: true
                         Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
 						KeyNavigation.up: confTitle
@@ -134,7 +134,7 @@ FocusScope {
                             Layout.preferredWidth: Utils.getSizeWithScreenRatio(94)
                             Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
 							background.visible: mainItem.isCreation
-                            contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
+                            contentText.font.weight: isCreation ? Font.Bold : Font.Normal
 							KeyNavigation.up: startDate
 							KeyNavigation.down: timeZoneCbox
 							KeyNavigation.left: endHour
@@ -154,7 +154,7 @@ FocusScope {
                             Layout.preferredWidth: Utils.getSizeWithScreenRatio(94)
                             Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
 							background.visible: mainItem.isCreation
-                            contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
+                            contentText.font.weight: isCreation ? Font.Bold : Font.Normal
 							onSelectedDateTimeChanged: mainItem.conferenceInfoGui.core.endDateTime = selectedDateTime
 							KeyNavigation.up: startDate
 							KeyNavigation.down: timeZoneCbox
diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml
index 77b2fff86..33b5a63ed 100644
--- a/Linphone/view/Page/Main/Call/CallPage.qml
+++ b/Linphone/view/Page/Main/Call/CallPage.qml
@@ -138,9 +138,13 @@ AbstractMainPage {
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0
-                RowLayout {
+                FlexboxLayout {
                     id: titleCallLayout
-                    spacing: Utils.getSizeWithScreenRatio(16)
+                    direction: FlexboxLayout.Row
+                    gap: Utils.getSizeWithScreenRatio(16)
+                    alignItems: FlexboxLayout.AlignCenter
+                    Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
+                    Layout.fillHeight: false
                     Text {
                         Layout.fillWidth: true
                         //: "Appels"
@@ -149,9 +153,6 @@ AbstractMainPage {
                         font.pixelSize: Typography.h2.pixelSize
                         font.weight: Typography.h2.weight
                     }
-                    Item {
-                        Layout.fillWidth: true
-                    }
                     PopupButton {
                         id: removeHistory
                         icon.width: Utils.getSizeWithScreenRatio(24)
@@ -190,7 +191,6 @@ AbstractMainPage {
                         icon.source: AppIcons.newCall
                         Layout.preferredWidth: Utils.getSizeWithScreenRatio(34)
                         Layout.preferredHeight: Utils.getSizeWithScreenRatio(34)
-                        Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
                         icon.width: Utils.getSizeWithScreenRatio(28)
                         icon.height: Utils.getSizeWithScreenRatio(28)
                         KeyNavigation.left: removeHistory
diff --git a/Linphone/view/Page/Main/Chat/ChatPage.qml b/Linphone/view/Page/Main/Chat/ChatPage.qml
index 26fbd82df..b2c3e8820 100644
--- a/Linphone/view/Page/Main/Chat/ChatPage.qml
+++ b/Linphone/view/Page/Main/Chat/ChatPage.qml
@@ -96,8 +96,12 @@ AbstractMainPage {
             ColumnLayout {
                 anchors.fill: parent
                 spacing: 0
-                RowLayout {
-                    spacing: Utils.getSizeWithScreenRatio(16)
+                FlexboxLayout {
+                    direction: FlexboxLayout.Row
+                    gap: Utils.getSizeWithScreenRatio(16)
+                    alignItems: FlexboxLayout.AlignCenter
+                    Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
+                    Layout.fillHeight: false
                     Text {
                         Layout.fillWidth: true
                         //: "Conversations"
@@ -106,9 +110,6 @@ AbstractMainPage {
                         font.pixelSize: Typography.h2.pixelSize
                         font.weight: Typography.h2.weight
                     }
-                    Item {
-                        Layout.fillWidth: true
-                    }
                     PopupButton {
                         id: chatListMenu
                         width: Utils.getSizeWithScreenRatio(24)
@@ -137,7 +138,6 @@ AbstractMainPage {
                         icon.source: AppIcons.plusCircle
                         Layout.preferredWidth: Utils.getSizeWithScreenRatio(28)
                         Layout.preferredHeight: Utils.getSizeWithScreenRatio(28)
-                        Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
                         icon.width: Utils.getSizeWithScreenRatio(28)
                         icon.height: Utils.getSizeWithScreenRatio(28)
                         KeyNavigation.down: searchBar
diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml
index 989a514d6..47008aadc 100644
--- a/Linphone/view/Page/Main/Contact/ContactPage.qml
+++ b/Linphone/view/Page/Main/Contact/ContactPage.qml
@@ -213,25 +213,25 @@ FriendGui{
         Layout.fillHeight: true
         Layout.fillWidth: true
 
-        RowLayout {
+        FlexboxLayout {
             id: title
-            spacing: 0
+            direction: FlexboxLayout.Row
+            gap: Utils.getSizeWithScreenRatio(16)
+            alignItems: FlexboxLayout.AlignCenter
             anchors.top: leftPanel.top
             anchors.right: leftPanel.right
             anchors.left: leftPanel.left
             anchors.leftMargin: leftPanel.leftMargin
             anchors.rightMargin: leftPanel.rightMargin
-
+            Layout.fillHeight: false
             Text {
+                Layout.fillWidth: true
                 //: "Contacts"
                 text: qsTr("bottom_navigation_contacts_label")
                 color: DefaultStyle.main2_700
                 font.pixelSize: Typography.h2.pixelSize
                 font.weight: Typography.h2.weight
             }
-            Item {
-                Layout.fillWidth: true
-            }
             Button {
                 id: createContactButton
                 visible: !rightPanelStackView.currentItem
diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
index 5b93e49c7..e845d46cc 100644
--- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml
+++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
@@ -177,11 +177,13 @@ AbstractMainPage {
 			ColumnLayout {
 				anchors.fill: parent
 				spacing: 0
-				RowLayout {
-                    Layout.rightMargin: Utils.getSizeWithScreenRatio(38)
+				FlexboxLayout {
+                    direction: FlexboxLayout.Row
+                    gap: Utils.getSizeWithScreenRatio(16)
+                    alignItems: FlexboxLayout.AlignCenter
+                    Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
 					Layout.alignment: Qt.AlignTop
-					Layout.fillWidth: true
-					spacing: 0					
+                    Layout.fillHeight: false
 					Text {
 						Layout.fillWidth: true
                         //: Réunions
@@ -190,7 +192,6 @@ AbstractMainPage {
                         font.pixelSize: Typography.h2.pixelSize
                         font.weight: Typography.h2.weight
 					}
-					Item{Layout.fillWidth: true}
 					Button {
 						id: newConfButton
 						style: ButtonStyle.noBackground
diff --git a/Linphone/view/Style/Typography.qml b/Linphone/view/Style/Typography.qml
index c132cba6d..0e0a8bf5f 100644
--- a/Linphone/view/Style/Typography.qml
+++ b/Linphone/view/Style/Typography.qml
@@ -8,132 +8,132 @@ QtObject {
 	property font h4: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(16),
-        weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
+        weight: Font.ExtraBold
 	})
 
 	// Title/H3M -  Bloc title
 	property font h3m: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(16),
-        weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
+        weight: Font.Bold
 	})
 	
 	// Title/H3 -  Bloc title
 	property font h3: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(22),
-        weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
+        weight: Font.ExtraBold
 	})
 
 	// Title/H2M -  Large bloc title
 	property font h2m: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(20),
-        weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
+        weight: Font.ExtraBold
 	})
 
 	// Title/H2 -  Large bloc title
 	property font h2: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(29),
-        weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
+        weight: Font.ExtraBold
 	})
 
 	// Title/H1 -  Large bloc title
 	property font h1: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(36),
-        weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
+        weight: Font.ExtraBold
 	})
 
 	// Text/P4 - Xsmall paragraph text
     property font p4: Qt.font( {
         family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(10),
-        weight: Math.min(Utils.getSizeWithScreenRatio(300), 1000)
+        weight: Font.Light
     })
 
     // Text/P3 - Reduced paragraph text
     property font p3: Qt.font( {
         family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(12),
-        weight: Math.min(Utils.getSizeWithScreenRatio(300), 1000)
+        weight: Font.Light
     })
 		
 	// Text/P2 - Bold, reduced paragraph text
 	property font p2: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(13),
-        weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
+        weight: Font.Bold
 	})
 
 	// Text/P2l - Large Bold, reduced paragraph text
 	property font p2l: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(14),
-        weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
+        weight: Font.Bold
 	})
 		
 	// Text/P1 - Paragraph text
 	property font p1: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(14),
-        weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
+        weight: Font.Normal
 	})
 	
 	// Text/P1s - Paragraph text
 	property font p1s: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(13),
-        weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
+        weight: Font.Normal
 	})
 	
 	// Text/P1 - Paragraph text
 	property font p1b: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(15),
-        weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
+        weight: Font.Normal
 	})
 	
 	// Button/B1 - Big Button
 	property font b1: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(18),
-        weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
+        weight: Font.DemiBold
 	})
 
 	// Button/B2 - Medium Button
 	property font b2: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(15),
-        weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
+        weight: Font.DemiBold
 	})
 	
 	// Button/B3 - Small Button
 	property font b3: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(13),
-        weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
+        weight: Font.DemiBold
 	})
 
 	// FileView/F1 - File View name text
 	property font f1: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(11),
-        weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
+        weight: Font.Bold
 	})
 
 	// FileView/F1light - File View size text
 	property font f1l: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(10),
-        weight: Math.min(Utils.getSizeWithScreenRatio(500), 1000)
+        weight: Font.Medium
 	})
 
 	// FileView/F1light - Duration text
 	property font d1: Qt.font( {
 		family: DefaultStyle.defaultFont,
         pixelSize: Utils.getSizeWithScreenRatio(8),
-        weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
+        weight: Font.DemiBold
 	})
 }