diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
index e281d7ce48..2d9a942731 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
@@ -38,14 +38,16 @@ ScrollView {
         }
 
         Button {
+            readonly property int buttonPadding: 5
+
             id: newMessagesBox
             height: 32
-            width: nbMessages.width + arrowImage.width + 2 * Style.current.halfPadding + (nbMessages.visible ? 5 : 0)
+            width: nbMessages.width + arrowImage.width + 2 * Style.current.halfPadding + (nbMessages.visible ? newMessagesBox.buttonPadding : 0)
             anchors.bottom: parent.bottom
             anchors.right: parent.right
             anchors.rightMargin: Style.current.padding
             background: Rectangle {
-                color: Style.current.buttonDisabledForegroundColor
+                color: Style.current.buttonSecondaryColor
                 border.width: 0
                 radius: 16
             }
@@ -74,7 +76,7 @@ ScrollView {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: nbMessages.right
                 source: "../../../img/leave_chat.svg"
-                anchors.leftMargin: nbMessages.visible ? 5 : 0
+                anchors.leftMargin: nbMessages.visible ? newMessagesBox.buttonPadding : 0
                 rotation: -90
 
                 ColorOverlay {
diff --git a/ui/imports/Themes/DarkTheme.qml b/ui/imports/Themes/DarkTheme.qml
index 62f8a4e527..d9e1e28f1d 100644
--- a/ui/imports/Themes/DarkTheme.qml
+++ b/ui/imports/Themes/DarkTheme.qml
@@ -51,7 +51,8 @@ Theme {
 
     property color buttonForegroundColor: blue
     property color buttonBackgroundColor: secondaryBackground
-    property color buttonDisabledForegroundColor: darkGrey
+    property color buttonSecondaryColor: darkGrey
+    property color buttonDisabledForegroundColor: buttonSecondaryColor
     property color buttonDisabledBackgroundColor: darkerGrey
 
     property color roundedButtonForegroundColor: white
diff --git a/ui/imports/Themes/LightTheme.qml b/ui/imports/Themes/LightTheme.qml
index 22e3d49bd4..989d6013de 100644
--- a/ui/imports/Themes/LightTheme.qml
+++ b/ui/imports/Themes/LightTheme.qml
@@ -50,7 +50,8 @@ Theme {
 
     property color buttonForegroundColor: blue
     property color buttonBackgroundColor: secondaryBackground
-    property color buttonDisabledForegroundColor: darkGrey
+    property color buttonSecondaryColor: darkGrey
+    property color buttonDisabledForegroundColor: buttonSecondaryColor
     property color buttonDisabledBackgroundColor: grey
 
     property color roundedButtonForegroundColor: buttonForegroundColor
diff --git a/ui/imports/Themes/Theme.qml b/ui/imports/Themes/Theme.qml
index ca9d229ff3..b55aec1c49 100644
--- a/ui/imports/Themes/Theme.qml
+++ b/ui/imports/Themes/Theme.qml
@@ -35,6 +35,7 @@ QtObject {
 
     property color buttonForegroundColor
     property color buttonBackgroundColor
+    property color buttonSecondaryColor
     property color buttonDisabledForegroundColor
     property color buttonDisabledBackgroundColor
     property color roundedButtonForegroundColor