diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index f3c9d145f2d3de4e5d18014feee1d724c9c4d821..40d3015854085ef0bc63dcd0e0b01fc2e532c68a 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -846,9 +846,9 @@ Item {
     property string enableDonation: qsTr("Enable donation campaign")
 
     //Chat setting page
-    property string enter: qsTr("ENTER")
-    property string shiftEnter: qsTr("SHIFT+ENTER")
-    property string textFormattingDescription: qsTr("ENTER or SHIFT+ENTER to insert a new line")
+    property string enter: qsTr("Enter")
+    property string shiftEnter: qsTr("Shift+Enter")
+    property string textFormattingDescription: qsTr("Enter or Shift+Enter to insert a new line")
     property string textFormatting: qsTr("Text formatting")
 
     //Connection monitoring
@@ -862,4 +862,5 @@ Item {
     property string channels: qsTr("Channels")
     property string copyAllData: qsTr("Copy all data")
     property string remote: qsTr("Remote: ")
+    property string view: qsTr("View")
 }
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 2010d8915119f6099e43a2bc08779982a1502de7..1e7c65d24e99b0964d83e4882bb40f83598e00f7 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -674,7 +674,7 @@ Item {
     }
 
     //Chat setting page
-    property color chatSettingButtonBackgroundColor: "#F0EFEF"
-    property color chatSettingButtonBorderColor: "#005699"
-    property color chatSettingButtonTextColor: "#000000"
+    property color chatSettingButtonBackgroundColor: darkTheme ? "#303030" : "#F0EFEF"
+    property color chatSettingButtonBorderColor: darkTheme ? "#03B9E9" : "#005699"
+    property color chatSettingButtonTextColor: textColor
 }
diff --git a/src/app/settingsview/components/ChatSettingsPage.qml b/src/app/settingsview/components/ChatSettingsPage.qml
index 3e44dfd604eee162c1a850ce1237893242868fae..7d9d7aa64fc9359ab974ebda83d029976cbe6ce0 100644
--- a/src/app/settingsview/components/ChatSettingsPage.qml
+++ b/src/app/settingsview/components/ChatSettingsPage.qml
@@ -55,7 +55,7 @@ SettingsPageBase {
                 Layout.alignment: Qt.AlignLeft
                 Layout.preferredWidth: parent.width
 
-                text: "View"
+                text: JamiStrings.view
                 color: JamiTheme.textColor
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
@@ -145,7 +145,7 @@ SettingsPageBase {
                 MaterialRadioButton {
                     id: enterButton
 
-                    width: 120
+                    width: 130
                     height: 40
                     backgroundColor: JamiTheme.chatSettingButtonBackgroundColor
                     textColor: JamiTheme.chatSettingButtonTextColor
@@ -164,7 +164,7 @@ SettingsPageBase {
                 MaterialRadioButton {
                     id: shiftEnterButton
 
-                    width: 180
+                    width: 210
                     height: 40
                     backgroundColor: JamiTheme.chatSettingButtonBackgroundColor
                     textColor: JamiTheme.chatSettingButtonTextColor