diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 1507cfd0..da36a167 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -319,7 +319,8 @@ Item {
     property string setAPassword: qsTr("Set password")
     property string changeCurrentPassword: qsTr("Change current password")
     property string tipBackupAccount: qsTr("Backup account to a .gz file")
-    property string tipAdvancedSettingsDisplay: qsTr("Display or hide advanced settings")
+    property string tipAdvancedSettingsDisplay: qsTr("Display advanced settings")
+    property string tipAdvancedSettingsHide: qsTr("Hide advanced settings")
     property string enableAccount: qsTr("Enable account")
 
     // NameRegistrationDialog
@@ -340,7 +341,8 @@ Item {
     property string linkDeviceNetWorkError: qsTr("Error connecting to the network.\nPlease try again later.")
 
     // BannedContacts
-    property string tipBannedContacts: qsTr("Display or hide banned contacts")
+    property string tipBannedContactsDisplay: qsTr("Display banned contacts")
+    property string tipBannedContactsHide: qsTr("Hide banned contacts")
 
     // DeleteAccountDialog
     property string confirmDeleteQuestion: qsTr("Do you really want to delete this account?")
diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml
index 980979f2..c1c73593 100644
--- a/src/settingsview/components/AdvancedSettings.qml
+++ b/src/settingsview/components/AdvancedSettings.qml
@@ -59,7 +59,9 @@ ColumnLayout {
             Layout.alignment: Qt.AlignHCenter
 
             imageColor: JamiTheme.textColor
-            toolTipText: JamiStrings.tipAdvancedSettingsDisplay
+            toolTipText: advancedSettingsView.visible ?
+                            JamiStrings.tipAdvancedSettingsHide :
+                            JamiStrings.tipAdvancedSettingsDisplay
 
             preferredSize: 32
             source: advancedSettingsView.visible ?
diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml
index 405b0ad8..e86281a3 100644
--- a/src/settingsview/components/BannedContacts.qml
+++ b/src/settingsview/components/BannedContacts.qml
@@ -87,7 +87,9 @@ ColumnLayout {
             Layout.preferredWidth: JamiTheme.preferredFieldHeight
             Layout.preferredHeight: JamiTheme.preferredFieldHeight
 
-            toolTipText: JamiStrings.tipBannedContacts
+            toolTipText: bannedListWidget.visible?
+                                JamiStrings.tipBannedContactsHide :
+                                JamiStrings.tipBannedContactsDisplay
             imageColor: JamiTheme.textColor
 
             source: bannedListWidget.visible?