Index: sources/gui/qml/compounds/InstructionView.qml
===================================================================
diff -u -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb -rdb2238dcf17941be6a3c587b55a3ef06b94cee96
--- sources/gui/qml/compounds/InstructionView.qml	(.../InstructionView.qml)	(revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb)
+++ sources/gui/qml/compounds/InstructionView.qml	(.../InstructionView.qml)	(revision db2238dcf17941be6a3c587b55a3ef06b94cee96)
@@ -30,18 +30,16 @@
     property var stepNames  : []
     property var stepImages : []
 
-    readonly property int currentStepIndex: _swipeview.currentIndex
-    readonly property int firstStep       : _swipeview.currentIndex == 0
-    readonly property int lastStep        : _swipeview.currentIndex == _swipeview.count - 1
+    readonly property int   currentStepIndex: _swipeview.currentIndex
+    readonly property bool  firstStep       : _swipeview.currentIndex == 0
+    readonly property bool  lastStep        : _swipeview.currentIndex == _swipeview.count - 1
 
-    readonly property int frameGap      : 47
-    readonly property int chevronWidth  : 25
-    readonly property int chevronHeight : 35
-    readonly property int chevronMargin : ( _root.frameGap - _root.chevronWidth ) / 2
-    readonly property int outerRadius   : 10
-    readonly property int outerHMargin  : 30
-    readonly property int outerVMargin  : 15
-    readonly property int innerRadius   :  5
+    readonly property int   frameGap      : 47
+    readonly property int   chevronWidth  : 25
+    readonly property int   chevronHeight : 35
+    readonly property int   chevronMargin : ( _root.frameGap - _root.chevronWidth ) / 2
+    readonly property int   outerRadius   : 10
+    readonly property int   innerRadius   :  5
 
     signal leftClicked ()
     signal rightClicked()
@@ -50,15 +48,6 @@
     border.color    : Colors.borderButton
     radius          : _root.outerRadius
 
-    anchors {
-        left            : parent.left
-        right           : parent.right
-        leftMargin      : _root.outerHMargin
-        rightMargin     : _root.outerHMargin
-        topMargin       : _root.outerVMargin
-        bottomMargin    : _root.outerVMargin
-    }
-
     Text { id: _message
         color   : Colors.textMain
         text    : _root.stepNames[_swipeview.currentIndex]