diff --git a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
index c60a5c526..ee7094a45 100644
--- a/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
+++ b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml
@@ -14,6 +14,7 @@ MouseArea {
   property var tooltipParent: parent
 
   property bool _visible: false
+  property int hoveringCursor : Qt.ArrowCursor
 
   anchors.fill:parent
 
@@ -21,6 +22,8 @@ MouseArea {
   scrollGestureEnabled: true
 
   onContainsMouseChanged: _visible = containsMouse
+  cursorShape: containsMouse ? hoveringCursor : Qt.ArrowCursor
+
   onPressed: mouse.accepted = false
   onWheel: {
     _visible = false
diff --git a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml
index 36f36d18c..d6ea734a9 100644
--- a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml
@@ -30,11 +30,11 @@ Item {
       spacing: ChatStyle.entry.message.extraContent.spacing
 
       Component {
-        id: icon
+        id: iconComponent
 
         Icon {
-
-          readonly property bool isError: Utils.includes([
+          id: iconId
+          readonly property var isError: Utils.includes([
                 ChatModel.MessageStatusFileTransferError,
                 ChatModel.MessageStatusNotDelivered,
                 ], $chatEntry.status)
@@ -48,19 +48,18 @@ Item {
           iconSize: ChatStyle.entry.message.outgoing.sendIconSize
 
           MouseArea {
+            id:retryAction
             anchors.fill: parent
-            cursorShape: containsMouse
-                            ? Qt.PointingHandCursor
-                            : Qt.ArrowCursor
-            hoverEnabled: true
-            visible: icon.isError || $chatEntry.status === ChatModel.MessageStatusIdle
+            visible: iconId.isError || $chatEntry.status === ChatModel.MessageStatusIdle
             onClicked: proxyModel.resendMessage(index)
           }
 
           TooltipArea {
-            text: isError
+            id:tooltip
+            text: iconId.isError
               ? qsTr('messageError')
               : (isRead ? qsTr('messageRead') : qsTr('messageDelivered'))
+              hoveringCursor : retryAction.visible?Qt.PointingHandCursor:Qt.ArrowCursor
           }
         }
       }
@@ -86,7 +85,7 @@ Item {
 
         sourceComponent: $chatEntry.status === ChatModel.MessageStatusInProgress || $chatEntry.status === ChatModel.MessageStatusFileTransferInProgress
           ? indicator
-          : icon
+          : iconComponent
       }
 
       ActionButton {