diff --git a/src/app/mainview/components/BackupTipBox.qml b/src/app/mainview/components/BackupTipBox.qml
index d58ef9c88df9c026cabc30bce892f394f3f8e0b5..e239cbef4899bf03bc08069b6577eab41d47b7ba 100644
--- a/src/app/mainview/components/BackupTipBox.qml
+++ b/src/app/mainview/components/BackupTipBox.qml
@@ -31,6 +31,10 @@ Item {
     width: parent.width
     height: backupLayout.height
 
+    property var iconSize: 26
+    property var margin: 5
+    property var prefWidth: 170
+
     signal ignore
 
     ColumnLayout {
@@ -50,9 +54,9 @@ Item {
                 visible: !opened
 
                 Layout.alignment: Qt.AlignLeft
-                Layout.topMargin: 5
-                Layout.preferredWidth: 26
-                Layout.preferredHeight: 26
+                Layout.topMargin: root.margin
+                Layout.preferredWidth: root.iconSize
+                Layout.preferredHeight: root.iconSize
 
                 containerHeight: Layout.preferredHeight
                 containerWidth: Layout.preferredWidth
@@ -61,21 +65,22 @@ Item {
                 color: JamiTheme.buttonTintedBlue
             }
 
-            Label {
+            Text {
                 text: JamiStrings.backupAccountBtn
                 color: JamiTheme.textColor
                 font.weight: Font.Medium
-                Layout.topMargin: 5
+                Layout.topMargin: root.margin
                 visible: !opened
                 Layout.alignment: Qt.AlignLeft
-                Layout.leftMargin: 5
+                Layout.leftMargin: root.margin
+                Layout.preferredWidth: root.prefWidth - 2 * root.margin - root.iconSize
                 font.pixelSize: JamiTheme.tipBoxTitleFontSize
+                elide: Qt.ElideRight
             }
         }
 
         Text {
-
-            Layout.preferredWidth: 170
+            Layout.preferredWidth: root.prefWidth
             Layout.leftMargin: 20
             Layout.topMargin: 8
             Layout.bottomMargin: 15
diff --git a/src/app/mainview/components/CustomizeTipBox.qml b/src/app/mainview/components/CustomizeTipBox.qml
index d2d4dbf82dde6eb6fa3f6ada687cb029a2182678..8aff49607851662958cea7b7f0a9d40546f6b9fe 100644
--- a/src/app/mainview/components/CustomizeTipBox.qml
+++ b/src/app/mainview/components/CustomizeTipBox.qml
@@ -26,9 +26,12 @@ import net.jami.Constants 1.1
 import "../../commoncomponents"
 
 ColumnLayout {
-
+    id: column
     width: parent.width
 
+    property var iconSize: 26
+    property var margin: 5
+    property var prefWidth: 170
 
     RowLayout {
 
@@ -41,9 +44,9 @@ ColumnLayout {
             visible: !opened
 
             Layout.alignment: Qt.AlignLeft
-            Layout.topMargin: 5
-            Layout.preferredWidth: 26
-            Layout.preferredHeight: 26
+            Layout.topMargin: column.margin
+            Layout.preferredWidth: column.iconSize
+            Layout.preferredHeight: column.iconSize
 
             containerHeight: Layout.preferredHeight
             containerWidth: Layout.preferredWidth
@@ -56,16 +59,17 @@ ColumnLayout {
             text: JamiStrings.customize
             color: JamiTheme.textColor
             font.weight: Font.Medium
-            Layout.topMargin: 5
+            Layout.topMargin: column.margin
+            Layout.preferredWidth: column.prefWidth - 2 * column.margin - column.iconSize
             visible: !opened
             Layout.alignment: Qt.AlignLeft
-            Layout.leftMargin: 5
+            Layout.leftMargin: column.margin
             font.pixelSize: JamiTheme.tipBoxTitleFontSize
+            elide: Qt.ElideRight
         }
     }
 
     Text {
-
         Layout.preferredWidth: 170
         Layout.leftMargin: 20
         Layout.topMargin: 8
diff --git a/src/app/mainview/components/InformativeTipBox.qml b/src/app/mainview/components/InformativeTipBox.qml
index ca7fd846b61f59e3da37b33c42dd8b5b4087f394..f5fbe94597ca9f97a3fa71c8009f147f87e2f0e1 100644
--- a/src/app/mainview/components/InformativeTipBox.qml
+++ b/src/app/mainview/components/InformativeTipBox.qml
@@ -27,9 +27,12 @@ import "../../commoncomponents"
 
 
 ColumnLayout {
-
+    id: column
     width: parent.width
 
+    property var iconSize: 26
+    property var margin: 5
+    property var prefWidth: 170
 
     RowLayout {
 
@@ -42,9 +45,9 @@ ColumnLayout {
             visible: !opened
 
             Layout.alignment: Qt.AlignLeft
-            Layout.topMargin: 5
-            Layout.preferredWidth: 26
-            Layout.preferredHeight: 26
+            Layout.topMargin: column.margin
+            Layout.preferredWidth: column.iconSize
+            Layout.preferredHeight: column.iconSize
 
             containerHeight: Layout.preferredHeight
             containerWidth: Layout.preferredWidth
@@ -57,16 +60,17 @@ ColumnLayout {
             text: JamiStrings.tip
             color: JamiTheme.textColor
             font.weight: Font.Medium
-            Layout.topMargin: 5
+            Layout.topMargin: column.margin
             visible: !opened
             Layout.alignment: Qt.AlignLeft
             Layout.leftMargin: 8
+            Layout.preferredWidth: column.prefWidth - 2 * column.margin - column.iconSize
             font.pixelSize: JamiTheme.tipBoxTitleFontSize
+            elide: Qt.ElideRight
         }
     }
 
     Text {
-
         Layout.preferredWidth: opened ? 140 : 150
         Layout.leftMargin: 20
         Layout.topMargin: opened ? 0 : 8