diff --git a/src/qml/QFieldGuide.qml b/src/qml/QFieldGuide.qml
index 3479c0acf4..80493be40f 100644
--- a/src/qml/QFieldGuide.qml
+++ b/src/qml/QFieldGuide.qml
@@ -190,8 +190,9 @@ Popup {
     }
 
     Text {
+      id: title
       objectName: "guideInternalTitle"
-      font.bold: true
+      font: Theme.strongFont
       elide: Text.ElideRight
       text: {
         if (internalObject.step) {
@@ -213,6 +214,7 @@ Popup {
     Text {
       id: description
       objectName: "guideInternalDescription"
+      font: Theme.tipFont
       wrapMode: Text.WordWrap
       color: Theme.mainTextColor
       text: {
@@ -235,31 +237,30 @@ Popup {
       id: animatedHint
       visible: internalObject.step.animatedGuide !== undefined
       source: visible ? internalObject.step.animatedGuide : ""
-      anchors.top: description.bottom
-      anchors.left: description.left
-      anchors.right: hintPanel.right
-      anchors.rightMargin: 15
+      anchors {
+        bottom: parent.bottom
+        left: parent.left
+        right: hintPanel.right
+        rightMargin: 15
+        bottomMargin: 15
+      }
       fillMode: AnimatedImage.PreserveAspectFit
-      anchors.topMargin: 8
     }
 
     QfButton {
       id: nextButton
+      objectName: "nextButton"
 
       property bool isLast: guide.index === steps.length - 1
 
-      objectName: "nextButton"
       text: isLast ? guide.finishText : guide.nextText
-      verticalPadding: 0
-      horizontalPadding: 12
       anchors {
         bottom: parent.bottom
-        bottomMargin: 8
         right: parent.right
         rightMargin: 15
+        bottomMargin: 15
       }
       bgcolor: Theme.mainColor
-      color: "white"
       height: 32
       radius: 5
       onClicked: {
@@ -275,9 +276,7 @@ Popup {
       id: previousButton
       objectName: "previousButton"
       text: guide.previousText
-      verticalPadding: 0
-      horizontalPadding: 12
-      bgcolor: "#00000000"
+      bgcolor: "transparent"
       color: Theme.mainColor
       height: 32
       radius: 5
@@ -285,8 +284,8 @@ Popup {
       anchors {
         right: nextButton.left
         bottom: parent.bottom
-        bottomMargin: 8
-        rightMargin: 14
+        bottomMargin: 15
+        rightMargin: 15
       }
       onClicked: {
         guide.index -= 1;
@@ -297,14 +296,13 @@ Popup {
       anchors {
         right: parent.right
         top: parent.top
-        margins: 2
+        topMargin: 8
+        rightMargin: 8
       }
       width: 30
       height: width
       icon.color: Theme.mainTextColor
       icon.source: Theme.getThemeIcon('ic_close_black_24dp')
-      icon.width: 45
-      icon.height: 45
       padding: 0
       bgcolor: "transparent"