diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index 4b2423a8e79561c6a0adc02fc77e87e51f866967..c40e484e05f7724f5782ac6d02b936de964be1a8 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -750,6 +750,7 @@ Item {
     //TipBox
     property string customize: qsTr("Customize")
     property string tips: qsTr("Tips")
+    property string dismiss: qsTr("Dismiss")
     property string customizeText: qsTr("Add a picture and a nickname to complete your profile")
     property string customizationDescription: qsTr("This profile is only shared with this account’s contacts")
     property string customizationDescription2: qsTr("Your profile is only shared with your contacts")
diff --git a/src/app/mainview/components/JamiIdentifier.qml b/src/app/mainview/components/JamiIdentifier.qml
index 6b00464634ab605a9d506619ff79ef01f821ab34..6c2426ab1cb45febedd8943f501d2bf048fe4a56 100644
--- a/src/app/mainview/components/JamiIdentifier.qml
+++ b/src/app/mainview/components/JamiIdentifier.qml
@@ -94,13 +94,15 @@ Rectangle {
                 PushButton {
                     id: btnEdit
 
-                    imageColor: enabled ? JamiTheme.buttonTintedBlue :  JamiTheme.buttonTintedBlack
-                    normalColor: JamiTheme.transparentColor
-                    Layout.topMargin: JamiTheme.pushButtonMargin
-                    hoverEnabled: false
                     preferredSize : 30
                     imageContainerWidth: JamiTheme.pushButtonSize
                     imageContainerHeight: JamiTheme.pushButtonSize
+
+                    Layout.topMargin: JamiTheme.pushButtonMargin
+
+                    imageColor: enabled ? JamiTheme.buttonTintedBlue :  JamiTheme.buttonTintedBlack
+                    normalColor: JamiTheme.transparentColor
+                    hoveredColor: JamiTheme.transparentColor
                     visible: editable && CurrentAccount.registeredName === ""
                     border.color: enabled ? JamiTheme.buttonTintedBlue :  JamiTheme.buttonTintedBlack
 
@@ -117,6 +119,7 @@ Rectangle {
                     }
 
                     source: JamiResources.round_edit_24dp_svg
+                    toolTipText: JamiStrings.chooseUsername
 
                     onClicked: {
                         if (!root.editing) {
diff --git a/src/app/mainview/components/TipBox.qml b/src/app/mainview/components/TipBox.qml
index 25b0951391c60de57c17ebef3099d5041f731cef..68026b3f9a427bcaa339746dc5be2452200be9eb 100644
--- a/src/app/mainview/components/TipBox.qml
+++ b/src/app/mainview/components/TipBox.qml
@@ -211,6 +211,7 @@ Item {
 
         imageColor: Qt.rgba(0, 86/255, 153/255, 1)
         normalColor: "transparent"
+        toolTipText: JamiStrings.dismiss
 
         source: JamiResources.round_close_24dp_svg