diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index 62bb7a56ea409caaebfdf4f1f0f95a63b75d76a9..526bf9006a14ccd84679c78c39919f282edc87e1 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -89,7 +89,7 @@ Item {
     property int titleFontSize: 16
     property int menuFontSize: 12
 
-    property int maximumWidthSettingsView: 800
+    property int maximumWidthSettingsView: 600
     property int preferredFieldWidth: 256
     property int preferredFieldHeight: 32
     property int preferredMarginSize: 16
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 6d9e8d4cfc1946c2798c0e856913abab61f81f2d..09ac2421e6ba8f51d49eef91e22653ca0eab818c 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -353,8 +353,9 @@ Window {
 
                 initialItem: welcomePage
 
-                SplitView.maximumWidth: sidePanelOnly ? splitView.width :
-                                                        splitView.width - sidePanelViewStackPreferredWidth
+                SplitView.maximumWidth: sidePanelOnly ?
+                                            splitView.width :
+                                            splitView.width - sidePanelViewStackPreferredWidth
                 SplitView.minimumWidth: sidePanelViewStackPreferredWidth
                 SplitView.fillHeight: true
 
@@ -540,7 +541,6 @@ Window {
 
     SettingsView {
         id: settingsView
-        anchors.fill: parent
 
         visible: false
 
diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml
index 9914c3708788b4c43eb7c47769ced15d5f0d9982..80520511c44eb012e1382cec72a18749747be037 100644
--- a/src/settingsview/SettingsView.qml
+++ b/src/settingsview/SettingsView.qml
@@ -179,8 +179,7 @@ Rectangle {
                 id: pageIdCurrentAccountSettings
 
                 Layout.fillHeight: true
-                Layout.maximumWidth: JamiTheme.maximumWidthSettingsView
-                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
 
                 isSIP: settingsViewRect.isSIP
 
@@ -198,8 +197,7 @@ Rectangle {
                 id: generalSettings
 
                 Layout.fillHeight: true
-                Layout.maximumWidth: JamiTheme.maximumWidthSettingsView
-                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
             }
 
             // av setting page, index 2
@@ -207,16 +205,15 @@ Rectangle {
                 id: avSettings
 
                 Layout.fillHeight: true
-                Layout.maximumWidth: JamiTheme.maximumWidthSettingsView
-                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
             }
 
             // plugin setting page, index 3
             PluginSettingsPage {
                 id: pluginSettings
+
                 Layout.fillHeight: true
-                Layout.maximumWidth: JamiTheme.maximumWidthSettingsView
-                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
             }
         }
     }
diff --git a/src/settingsview/components/AudioSettings.qml b/src/settingsview/components/AudioSettings.qml
index 3a41a61706420a7336101857326d6b6f38887122..4e57bf1463e6e9a01b24f705034cf84ddcdd10d1 100644
--- a/src/settingsview/components/AudioSettings.qml
+++ b/src/settingsview/components/AudioSettings.qml
@@ -129,7 +129,7 @@ ColumnLayout {
         id: audioInputMeter
 
         Layout.alignment: Qt.AlignHCenter
-        Layout.preferredWidth: itemWidth * 2
+        Layout.preferredWidth: itemWidth * 1.5
         Layout.preferredHeight: JamiTheme.preferredFieldHeight
 
         indeterminate: false
diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml
index 9c9147cac5a03e125ece25f6bdef63832ab37a4d..4ba74194ac3ed2c7d67c158a87f95201ff4132d5 100644
--- a/src/settingsview/components/AvSettingPage.qml
+++ b/src/settingsview/components/AvSettingPage.qml
@@ -31,7 +31,7 @@ import "../../commoncomponents"
 Rectangle {
     id: root
 
-    property int preferredColumnWidth: root.width / 2 - 50
+    property int preferredColumnWidth: Math.min(root.width / 2 - 50, 275)
 
     signal backArrowClicked
 
@@ -48,7 +48,10 @@ Rectangle {
     }
 
     ColumnLayout {
-        anchors.fill: root
+        anchors.centerIn: root
+
+        height: root.height
+        width: Math.min(JamiTheme.maximumWidthSettingsView, root.width)
 
         SettingsHeader {
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
@@ -75,7 +78,7 @@ Rectangle {
             clip: true
 
             ColumnLayout {
-                width: root.width
+                width: avSettingsScrollView.width
 
                 // Audio
                 AudioSettings {
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index 6b8051f42dfdb7dd8fc969e7056eb27b45e29b16..56eb29e8812b230f9058e58c2b10f3c015ef4065 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -36,7 +36,7 @@ Rectangle {
 
     property bool isSIP
 
-    property int preferredColumnWidth : root.width / 2 - 50
+    property int preferredColumnWidth : Math.min(root.width / 2 - 50, 350)
 
     signal navigateToMainView
     signal navigateToNewWizardView
@@ -159,7 +159,10 @@ Rectangle {
     }
 
     ColumnLayout {
-        anchors.fill: root
+        anchors.centerIn: root
+
+        height: root.height
+        width: Math.min(JamiTheme.maximumWidthSettingsView, root.width)
 
         SettingsHeader {
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
@@ -188,7 +191,7 @@ Rectangle {
             ColumnLayout {
                 id: accountLayout
 
-                width: root.width
+                width: scrollView.width
 
                 ToggleSwitch {
                     id: accountEnableCheckBox
@@ -327,4 +330,4 @@ Rectangle {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml
index ce8ec4cd7fcc2c9eeacf794dbcdd04aa4ef04538..1dc91db2ac73026e594f680997e0c4c90dc8802d 100644
--- a/src/settingsview/components/GeneralSettingsPage.qml
+++ b/src/settingsview/components/GeneralSettingsPage.qml
@@ -31,12 +31,15 @@ import "../../commoncomponents"
 Rectangle {
     id: root
 
-    property int preferredColumnWidth : root.width / 2 - 50
+    property int preferredColumnWidth : Math.min(root.width / 2 - 50, 350)
 
     signal backArrowClicked
 
     ColumnLayout {
-        anchors.fill: root
+        anchors.centerIn: root
+
+        height: root.height
+        width: Math.min(JamiTheme.maximumWidthSettingsView, root.width)
 
         SettingsHeader {
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
@@ -59,7 +62,7 @@ Rectangle {
             clip: true
 
             ColumnLayout {
-                width: root.width
+                width: generalSettingsScrollView.width
 
                 // system setting panel
                 SystemSettings {
diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml
index cd32e65e19b0f9f88bf01a0cf47fe6c2d1e06d3b..e8f94e78ba43b36df661f507158146e9846b0806 100644
--- a/src/settingsview/components/PluginSettingsPage.qml
+++ b/src/settingsview/components/PluginSettingsPage.qml
@@ -41,7 +41,10 @@ Rectangle {
     signal backArrowClicked
 
     ColumnLayout {
-        anchors.fill: root
+        anchors.centerIn: root
+
+        height: root.height
+        width: Math.min(JamiTheme.maximumWidthSettingsView, root.width)
 
         SettingsHeader {
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
@@ -56,15 +59,15 @@ Rectangle {
 
         ScrollView {
             id: pluginScrollView
+
             Layout.fillHeight: true
             Layout.fillWidth: true
 
             focus: true
-
             clip: true
 
             ColumnLayout {
-                width: root.width
+                width: pluginScrollView.width
 
                 ToggleSwitch {
                     id: enabledplugin