Index: sources/gui/qml/components/SettingsItem.qml
===================================================================
diff -u -r5c9b16612ce300bba9c6f5a8c04f88a4bd67fefa -rd129507ca6ee06e76bd3500a77996687e09d3144
--- sources/gui/qml/components/SettingsItem.qml	(.../SettingsItem.qml)	(revision 5c9b16612ce300bba9c6f5a8c04f88a4bd67fefa)
+++ sources/gui/qml/components/SettingsItem.qml	(.../SettingsItem.qml)	(revision d129507ca6ee06e76bd3500a77996687e09d3144)
@@ -34,39 +34,39 @@
     width: Variables.settingsOptionWidth
     height: Variables.settingsOptionHeight
 
-    MouseArea {
-        anchors.fill: parent;
 
-        Text { id: _titleText
-            anchors.left: parent.left;
-            anchors.verticalCenter: parent.verticalCenter
-            text: "Settings Option 1"
-            color: Colors.textButton
-            font.pixelSize: Fonts.fontPixelButton
 
-        }
+    Text { id: _titleText
+        anchors.left: parent.left;
+        anchors.verticalCenter: parent.verticalCenter
+        text: "Settings Option 1"
+        color: Colors.textButton
+        font.pixelSize: Fonts.fontPixelButton
 
-        Image { id: _arrowImage
-            visible: true
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            width : Variables.largeArrowWidth
-            height: Variables.largeArrowHeight
-            source: "qrc:/images/iArrow"
-        }
+    }
 
-        Line {
-            width: parent.width
-            color: "gray"
-            anchors.left: parent.left;
-            anchors.bottom: parent.bottom;
-        }
+    Image { id: _arrowImage
+        visible: true
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        width : Variables.largeArrowWidth
+        height: Variables.largeArrowHeight
+        source: "qrc:/images/iArrow"
+    }
 
+    Line {
+        width: parent.width
+        color: "gray"
+        anchors.left: parent.left;
+        anchors.bottom: parent.bottom;
+    }
+
+    MouseArea {
+        anchors.fill: parent;
         onClicked: {
             console.debug("Clicked " + _titleText.text);
             _root.clicked();
         }
-
     }
 
 }
Index: sources/gui/qml/pages/Diagnostics.qml
===================================================================
diff -u -rcbea4224ad67eecc2e7c4c66df9a7db711c72832 -rd129507ca6ee06e76bd3500a77996687e09d3144
--- sources/gui/qml/pages/Diagnostics.qml	(.../Diagnostics.qml)	(revision cbea4224ad67eecc2e7c4c66df9a7db711c72832)
+++ sources/gui/qml/pages/Diagnostics.qml	(.../Diagnostics.qml)	(revision d129507ca6ee06e76bd3500a77996687e09d3144)
@@ -27,6 +27,7 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
+    signal backClicked()
 
     USBButton { id: _usbButton
             anchors {
@@ -64,12 +65,16 @@
             }
         }
 
+        BackButton { id : _backButton
+            onClicked: backClicked();
+        }
+
         Text { id : _canbusFaultCountText
             property int count: 0
             visible: true
             anchors {
                 top         : parent.top
-                left        : parent.left
+                left        : _backButton.right
                 topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
                 leftMargin  : (Variables.headerHeight - Variables.logoHeight) / 2
             }
Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -rd129507ca6ee06e76bd3500a77996687e09d3144
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 73b965e55528619f22a12ae3b3408c9dcecc9144)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision d129507ca6ee06e76bd3500a77996687e09d3144)
@@ -38,20 +38,18 @@
 
     }
 
-    Diagnostics { id: _diagnostics  }
+    Diagnostics {
+        id: _diagnostics
+        onBackClicked: pop()
+    }
 
     Column {
         anchors.centerIn: parent;
 
         // add each settings page here.
-        SettingsItem { id: _item_sound
-            title   : qsTr("Sound")
-        }
         SettingsItem { id: _item_diagnostics
             title   : qsTr("Diagnostics")
-            onClicked: {
-                push(_diagnostics);
-            }
+            onClicked: push(_diagnostics);
         }
     }