diff --git a/src/app/commoncomponents/MaterialRadioButton.qml b/src/app/commoncomponents/MaterialRadioButton.qml
index 28b4bb50..d9c90cef 100644
--- a/src/app/commoncomponents/MaterialRadioButton.qml
+++ b/src/app/commoncomponents/MaterialRadioButton.qml
@@ -74,7 +74,7 @@ RadioButton {
         spacing: 10
 
         anchors.left: root.indicator.right
-        anchors.leftMargin: root.spacing
+        anchors.leftMargin: 10
 
         ResponsiveImage {
             color: borderColor
@@ -89,6 +89,8 @@ RadioButton {
             font.pixelSize: JamiTheme.settingsDescriptionPixelSize
             text: root.text
             wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
         }
     }
 
diff --git a/src/app/mainview/components/OngoingCallPage.qml b/src/app/mainview/components/OngoingCallPage.qml
index b5984f0b..c5f75426 100644
--- a/src/app/mainview/components/OngoingCallPage.qml
+++ b/src/app/mainview/components/OngoingCallPage.qml
@@ -125,18 +125,18 @@ Rectangle {
         anchors.fill: parent
 
         property bool isHorizontal: false // Calculated when showing the stack view
-        orientation: isHorizontal ? Qt.Horizontal : Qt.Vertical
+        orientation: isHorizontal ? Qt.Vertical : Qt.Horizontal // Chatview is horizontal if split is vertical (so chatview takes full width)
 
         handle: Rectangle {
-            implicitWidth: mainColumnLayout.isHorizontal ? JamiTheme.splitViewHandlePreferredWidth : root.width
-            implicitHeight: mainColumnLayout.isHorizontal ? root.height : JamiTheme.splitViewHandlePreferredWidth
+            implicitWidth: mainColumnLayout.isHorizontal ? root.width : JamiTheme.splitViewHandlePreferredWidth
+            implicitHeight: mainColumnLayout.isHorizontal ? JamiTheme.splitViewHandlePreferredWidth : root.height
             color: SplitHandle.pressed ? JamiTheme.pressColor : (SplitHandle.hovered ? JamiTheme.hoverColor : JamiTheme.tabbarBorderColor)
         }
 
         Rectangle {
             id: callPageMainRect
 
-            SplitView.preferredHeight: mainColumnLayout.isHorizontal ? root.height : (root.height / 3) * 2
+            SplitView.preferredHeight: mainColumnLayout.isHorizontal ? (root.height / 3) * 2 : root.height
             SplitView.minimumWidth: JamiTheme.mainViewPaneMinWidth
             SplitView.fillWidth: true
 
diff --git a/src/app/settingsview/components/CallSettingsPage.qml b/src/app/settingsview/components/CallSettingsPage.qml
index 440853d4..436d6a2b 100644
--- a/src/app/settingsview/components/CallSettingsPage.qml
+++ b/src/app/settingsview/components/CallSettingsPage.qml
@@ -342,32 +342,14 @@ SettingsPageBase {
                     id: optionsB
                 }
 
-                MaterialRadioButton {
-                    id: verticalRadio
-                    width: 255
-                    height: 60
-
-                    text: JamiStrings.verticalViewOpt
-                    ButtonGroup.group: optionsB
-                    iconSource: JamiResources.horizontal_view_svg
-
-                    onCheckedChanged: {
-                        if (checked) {
-                            UtilsAdapter.setAppValue(Settings.Key.ShowChatviewHorizontally, false);
-                        }
-                    }
-                }
-
                 MaterialRadioButton {
                     id: horizontalRadio
-
                     width: 255
                     height: 60
 
                     text: JamiStrings.horizontalViewOpt
                     ButtonGroup.group: optionsB
-                    //color: JamiTheme.blackColor
-                    iconSource: JamiResources.vertical_view_svg
+                    iconSource: JamiResources.horizontal_view_svg
 
                     onCheckedChanged: {
                         if (checked) {
@@ -375,6 +357,24 @@ SettingsPageBase {
                         }
                     }
                 }
+
+                MaterialRadioButton {
+                    id: verticalRadio
+
+                    width: 255
+                    height: 60
+
+                    text: JamiStrings.verticalViewOpt
+                    ButtonGroup.group: optionsB
+                    //color: JamiTheme.blackColor
+                    iconSource: JamiResources.vertical_view_svg
+
+                    onCheckedChanged: {
+                        if (checked) {
+                            UtilsAdapter.setAppValue(Settings.Key.ShowChatviewHorizontally, false);
+                        }
+                    }
+                }
             }
         }
     }