diff --git a/src/app/commoncomponents/BackButton.qml b/src/app/commoncomponents/BackButton.qml
index 781498514146bd3a2db3bd8a78a3a5d96f9e8b0f..7bfa52eba178c5f23aa742275de0e45342a2a2ca 100644
--- a/src/app/commoncomponents/BackButton.qml
+++ b/src/app/commoncomponents/BackButton.qml
@@ -42,4 +42,6 @@ PushButton {
             keyEvent.accepted = true;
         }
     }
+
+    QWKSetParentHitTestVisible {}
 }
diff --git a/src/app/settingsview/components/PluginPreferencesView.qml b/src/app/settingsview/components/PluginPreferencesView.qml
index a057195224a98c63ffb2a987cd90e9592a0ff781..3a12546a35a04d5e39cdc9390714d9f6086d6b89 100644
--- a/src/app/settingsview/components/PluginPreferencesView.qml
+++ b/src/app/settingsview/components/PluginPreferencesView.qml
@@ -80,25 +80,19 @@ Item {
                     }
                 }
                 contentItem: ColumnLayout {
-                    width: parent.width
-                    JamiPushButton {
+                    JamiPushButton { QWKSetParentHitTestVisible {}
                         id: closeButton
+                        readonly property bool alignLeft: Qt.platform.os.toString() !== "osx"
                         normalColor: Qt.rgba(124, 124, 124, 0.36)
                         hoveredColor: Qt.rgba(124, 124, 124, 0.75)
-                        Layout.alignment: Qt.AlignRight
+                        Layout.alignment: alignLeft ? Qt.AlignLeft : Qt.AlignRight
+                        Layout.leftMargin: 10
+                        Layout.rightMargin: 30
                         Layout.topMargin: 10
-                        Layout.rightMargin: 35
-                        Layout.preferredWidth: JamiTheme.preferredFieldHeight
-                        Layout.preferredHeight: childrenRect.height
-
                         imageColor: JamiTheme.blackColor
                         toolTipText: JamiStrings.closeSettings
-
-                        preferredSize: 32
                         source: JamiResources.round_close_24dp_svg
-                        onClicked: {
-                            closed();
-                        }
+                        onClicked: closed()
                     }
 
                     ResponsiveImage {
diff --git a/src/app/settingsview/components/SettingsHeader.qml b/src/app/settingsview/components/SettingsHeader.qml
index 9b203db2c5f223e4647fd928fd012c55f933fdb3..ec686c80322e830a56254db33fa0aaab93274388 100644
--- a/src/app/settingsview/components/SettingsHeader.qml
+++ b/src/app/settingsview/components/SettingsHeader.qml
@@ -29,7 +29,7 @@ RowLayout {
     signal backArrowClicked
     spacing: 10
 
-    BackButton { QWKSetParentHitTestVisible {}
+    BackButton {
         id: backToSettingsMenuButton
 
         Layout.preferredWidth: JamiTheme.preferredFieldHeight
diff --git a/src/app/wizardview/WizardView.qml b/src/app/wizardview/WizardView.qml
index 995de99198e10120d89fee940008eca61c4bff41..16c45c00834e084961ebb6587dfbbe7afdf2fa0c 100644
--- a/src/app/wizardview/WizardView.qml
+++ b/src/app/wizardview/WizardView.qml
@@ -33,7 +33,7 @@ BaseView {
 
     inhibits: ["ConversationView"]
 
-    color: JamiTheme.backgroundColor
+    color: JamiTheme.secondaryBackgroundColor
 
     Connections {
         target: AccountAdapter
@@ -90,6 +90,7 @@ BaseView {
         property ScrollBar vScrollBar: ScrollBar.vertical
 
         anchors.fill: parent
+        anchors.topMargin: appWindow.useFrameless && Qt.platform.os.toString() === "osx" ? 16 : 0
 
         contentHeight: controlPanelStackView.height
         boundsBehavior: Flickable.StopAtBounds