use toolbar for EmailForm.ui, ExistingLoginForm.ui, PasswordForm.ui, ConfirmPasswordForm.ui

1 files changed, 16 insertions, 12 deletions

diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml
index a306c50..7b9ee46 100644
--- a/pages/PasswordForm.ui.qml
+++ b/pages/PasswordForm.ui.qml
@@ -13,26 +13,30 @@ Rectangle {
     property alias createPassButton: createPassButton
     property alias emailAddressLabel: emailAddressLabel
 
-    Rectangle {
-        id: appBar
+    ToolBar {
+        id: toolbar
         height: 56
-        color: "#ffffff"
+        font.family: "Google Sans"
         anchors.top: parent.top
         anchors.topMargin: 0
         anchors.right: parent.right
         anchors.rightMargin: 0
         anchors.left: parent.left
         anchors.leftMargin: 0
+        background: Rectangle {
+            color: "#FFF"
+        }
 
-        RoundButton {
-            id: backButton
-            flat: true
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            display: AbstractButton.IconOnly
-            icon.name: "back-icon"
-            icon.source: "/assets/arrow-back-24px.svg"
-            icon.color: "transparent"
+        RowLayout {
+            anchors.fill: parent
+            spacing: 8
+
+            ToolButton {
+                id: backButton
+                icon.name: "back-icon"
+                icon.source: "/assets/arrow-back-24px.svg"
+                highlighted: true
+            }
         }
     }