1 files changed, 16 insertions, 16 deletions

diff --git a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
index 192ae4d4..7a5207c9 100644
--- a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
+++ b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
@@ -39,9 +39,11 @@ import shared.Style 1.0
 import shared.Sizes 1.0
 import "../helpers" 1.0
 
-Row {
+RowLayout {
     id: root
 
+    property string neptuneWindowState
+
     property string destination: ""
     property string routeDistance: ""
     property string routeTime: ""
@@ -52,27 +54,24 @@ Row {
 
     spacing: Sizes.dp(45 * .5)
 
-    ToolButton {
-        width: Sizes.dp(45 * .9)
-        height: width
-        visible: root.state === "demo_driving"
-        icon.source: Qt.resolvedUrl("../assets/ic-end-route.png")
-        onClicked: root.stopNavigation()
-    }
-
     RowLayout {
-        width: root.state === "demo_driving"
-               ? parent.width : parent.width / 2
-        anchors.verticalCenter: parent.verticalCenter
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
         spacing: Sizes.dp(45 * .7)
+        width: parent.width / 2
 
         ToolButton {
             Layout.leftMargin: parent.spacing
             width: Sizes.dp(45)
             height: width
             enabled: visible
-            visible: root.state === "route_selection" || root.state === "destination_selection"
-            icon.name: LayoutMirroring.enabled ? "ic_forward" : "ic_back"
+            visible: root.state === "route_selection"
+                     || root.state === "destination_selection"
+                     || root.state === "demo_driving"
+            icon.name: root.state === "demo_driving"
+                       ? "" : LayoutMirroring.enabled ? "ic_forward" : "ic_back"
+            icon.source: root.state === "demo_driving"
+                        ? Qt.resolvedUrl("../assets/ic-end-route.png") : ""
             onClicked: root.stopNavigation()
         }
 
@@ -97,9 +96,10 @@ Row {
         id: startNavigationButton
         width: parent.width / 3
         height: Sizes.dp(80)
-        anchors.verticalCenter: parent.verticalCenter
+        Layout.alignment: Qt.AlignVCenter
         scale: pressed ? 1.1 : 1.0
-        visible: root.state === "destination_selection" || root.state === "route_selection"
+        visible: root.state === "destination_selection"
+                 || root.state === "route_selection"
         Behavior on scale { NumberAnimation { duration: 50 } }
         Behavior on opacity { NumberAnimation { duration: 150 } }