Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
===================================================================
diff -u -r4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a -r81aec0b1316a43c46f8c27c773d8f95e695ec273
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 81aec0b1316a43c46f8c27c773d8f95e695ec273)
@@ -17,9 +17,6 @@
 import QtQuick 2.12
 
 // Project
-import Gui.Actions      0.1
-import Gui.VEventSpy    0.1
-
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
@@ -29,33 +26,17 @@
  */
 ModalDialog { id: _root
 
-    width   : Variables.applicationWidth
-    height  : Variables.applicationHeight   - 60
+    width           : Variables.dialogWidth
+    height          : Variables.dialogHeight
+    clip            : true
 
     DiagnosticsSwipe { id: _diagnosticsSwipe
         anchors.fill: parent
     }
 
-    Rectangle {
-        anchors.centerIn: _closeButton
-        border.color    : Colors.white
-        color           : Colors.transparent
-        border.width    : Variables.borderWidth
-        width           : _closeButton.width + 10
-        height          : width
-        radius          : width
-    }
-
-    CloseButton { id    : _closeButton
-        anchors.left    : undefined
-        anchors.right   : parent.right
-        anchors.top     : undefined
-        anchors.bottom  : parent.bottom
-        anchors.margins : 10
-        onClicked       : {
+    CloseButton { id : _closeButton
+        onClicked : {
             _root.close()
-            console.log("close clicked")
         }
     }
-
 }