diff --git a/src/qml/pages/settings/SettingsConnection.qml b/src/qml/pages/settings/SettingsConnection.qml
index 71c9c57a9b..9ff9094f11 100644
--- a/src/qml/pages/settings/SettingsConnection.qml
+++ b/src/qml/pages/settings/SettingsConnection.qml
@@ -34,17 +34,8 @@ Item {
             detailItem: ConnectionSettings {}
         }
         SettingsProxy {
-            navLeftDetail: NavButton {
-                iconSource: "image://images/caret-left"
-                text: qsTr("Back")
-                onClicked: {
-                    connectionSwipe.decrementCurrentIndex()
-                }
-            }
-            navMiddleDetail: Header {
-                headerBold: true
-                headerSize: 18
-                header: qsTr("Proxy Settings")
+            onBackClicked: {
+                connectionSwipe.decrementCurrentIndex()
             }
         }
     }
diff --git a/src/qml/pages/settings/SettingsProxy.qml b/src/qml/pages/settings/SettingsProxy.qml
index 1f31e1524d..ce8a906f10 100644
--- a/src/qml/pages/settings/SettingsProxy.qml
+++ b/src/qml/pages/settings/SettingsProxy.qml
@@ -9,9 +9,9 @@ import "../../controls"
 import "../../components"
 
 Page {
-    id: proxy_settings
-    property alias navLeftDetail: navbar.leftDetail
-    property alias navMiddleDetail: navbar.middleDetail
+    signal backClicked
+
+    id: root
 
     background: null
     implicitWidth: 450
@@ -19,8 +19,17 @@ Page {
     rightPadding: 20
     topPadding: 30
 
-    header: NavigationBar {
-        id: navbar
+    header: NavigationBar2 {
+        leftItem: NavButton {
+            iconSource: "image://images/caret-left"
+            text: qsTr("Back")
+            onClicked: root.backClicked()
+        }
+        centerItem: Header {
+            headerBold: true
+            headerSize: 18
+            header: qsTr("Proxy Settings")
+        }
     }
     ProxySettings {
         width: Math.min(parent.width, 450)