diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 938f980958a49a1921734098f13409ec5b6e5efa..2ff11e42bd9d78853f858c792b8f62e5fca597d9 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -254,6 +254,7 @@ Item {
     property color previewUrlColor: darkTheme ? "#eeeeee" : "#333"
     property color messageWebViewFooterButtonImageColor: darkTheme ? "#838383" : "#656565"
     property color chatviewSecondaryInformationColor: "#A7A7A7"
+    property color draftIconColor: "#707070"
 
     // ChatView Footer
     property color chatViewFooterListColor: darkTheme ? blackColor : "#E5E5E5"
diff --git a/src/app/mainview/components/SmartListItemDelegate.qml b/src/app/mainview/components/SmartListItemDelegate.qml
index 53708f12f76eb5d108721ca0efaaf30aea946934..ef54c8d36b54facdff8f821e3c7a807b69b8e17f 100644
--- a/src/app/mainview/components/SmartListItemDelegate.qml
+++ b/src/app/mainview/components/SmartListItemDelegate.qml
@@ -192,11 +192,29 @@ ItemDelegate {
             }
         }
 
+        BlinkingLocationIcon {
+            isSharing: true
+            visible: showSharePositionIndicator
+            arrowTimerVisibility: locationIconTimer.showIconArrow
+            color: JamiTheme.draftIconColor
+            containerWidth: 25
+        }
+
+        BlinkingLocationIcon {
+            isSharing: false
+            visible: showSharedPositionIndicator
+            arrowTimerVisibility: locationIconTimer.showIconArrow
+            color: JamiTheme.draftIconColor
+            containerWidth: 25
+        }
+
         // Draft indicator
         ResponsiveImage {
             visible: Draft && !root.highlighted
+            containerWidth: 20
+
             source: JamiResources.round_edit_24dp_svg
-            color: JamiTheme.primaryForegroundColor
+            color: JamiTheme.draftIconColor
         }
 
         // Show that a call is ongoing for groups indicator
@@ -206,20 +224,6 @@ ItemDelegate {
             color: JamiTheme.primaryForegroundColor
         }
 
-        BlinkingLocationIcon {
-            isSharing: true
-            visible: showSharePositionIndicator
-            arrowTimerVisibility: locationIconTimer.showIconArrow
-            color: JamiTheme.sharePositionIndicatorColor
-        }
-
-        BlinkingLocationIcon {
-            isSharing: false
-            visible: showSharedPositionIndicator
-            arrowTimerVisibility: locationIconTimer.showIconArrow
-            color: JamiTheme.sharedPositionIndicatorColor
-        }
-
         ColumnLayout {
             Layout.fillHeight: true
             spacing: 2
@@ -228,6 +232,7 @@ ItemDelegate {
             Text {
                 id: callStatusText
 
+                visible : text
                 Layout.minimumHeight: 20
                 Layout.alignment: Qt.AlignRight
                 text: InCall ? UtilsAdapter.getCallStatusStr(CallState) : ""
@@ -239,17 +244,23 @@ ItemDelegate {
 
             // unread message count
             Item {
+
                 Layout.preferredWidth: childrenRect.width
                 Layout.preferredHeight: childrenRect.height
                 Layout.alignment: Qt.AlignTop | Qt.AlignRight
                 BadgeNotifier {
-                    size: 20
+                    size: 16
                     count: UnreadMessagesCount
                     animate: index === 0
+                    radius: 3
                 }
             }
         }
 
+
+
+
+
         Accessible.role: Accessible.Button
         Accessible.name: Title === undefined? "" : Title
         Accessible.description: LastInteraction === undefined? "" : LastInteraction