Index: leahi.qrc
===================================================================
diff -u -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d -reaa02e45b2d5f0910309bea7165963a539f9db97
--- leahi.qrc	(.../leahi.qrc)	(revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
+++ leahi.qrc	(.../leahi.qrc)	(revision eaa02e45b2d5f0910309bea7165963a539f9db97)
@@ -33,8 +33,15 @@
         <file alias="AutoHideInfo.qml">sources/gui/qml/dialogs/AutoHideInfo.qml</file>
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
         <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
-        <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/DiagnosticsDialog.qml</file>
+        <file alias="LockDialog.qml">sources/gui/qml/dialogs/LockDialog.qml</file>
     </qresource>
+    <qresource prefix="/dialogs/diagnostics">
+        <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
+        <file alias="DiagnosticsBase.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml</file>
+        <file alias="DiagnosticsSwipe.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml</file>
+        <file alias="DiagnosticsTD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml</file>
+        <file alias="DiagnosticsDD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
@@ -45,8 +52,6 @@
         <file alias="iClose">resources/images/Close.png</file>
         <file alias="iBellOn">resources/images/bell-on.png</file>
         <file alias="iBellOff">resources/images/bell-off.png</file>
-        <file alias="iBack">resources/images/Back.png</file>
-        <file alias="iPauseDarkBlue">resources/images/PauseDarkBlue.png</file>
         <file alias="iPauseLightBlue">resources/images/PauseLightBlue.png</file>
         <file alias="iPauseGray">resources/images/PauseGray.png</file>
         <file alias="iResume">resources/images/Resume.png</file>
@@ -81,6 +86,10 @@
         <file alias="iPauseOrange">resources/images/PauseOrange.png</file>
         <file alias="iArrowsExpanding">resources/images/arrowsExpanding.png</file>
         <file alias="iHomeBackground">resources/images/HomeBackground.png</file>
+        <file alias="iBluetooth">resources/images/Bluetooth.png</file>
+        <file alias="iCloudSync">resources/images/CloudSync.png</file>
+        <file alias="iInformation">resources/images/Information.png</file>
+        <file alias="iStorage">resources/images/Storage.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -145,6 +154,7 @@
         <file alias="ContentArea.qml">sources/gui/qml/components/ContentArea.qml</file>
         <file alias="LabelValue.qml">sources/gui/qml/components/LabelValue.qml</file>
         <file alias="ArrowButton.qml">sources/gui/qml/components/ArrowButton.qml</file>
+        <file alias="HeaderBar.qml">sources/gui/qml/components/HeaderBar.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -153,6 +163,8 @@
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
         <file alias="TouchGrid.qml">sources/gui/qml/compounds/TouchGrid.qml</file>
         <file alias="BPHREntry.qml">sources/gui/qml/compounds/BPHREntry.qml</file>
+        <file alias="StoppedSlider.qml">sources/gui/qml/compounds/StoppedSlider.qml</file>
+        <file alias="TreatmentAdjustmentUltrafiltrationMetrics.qml">sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
@@ -248,7 +260,6 @@
         <file alias="TreatmentAdjustmentBase.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml</file>
         <file alias="TreatmentAdjustmentDuration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationStart.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml</file>
-        <file alias="TreatmentAdjustmentUltrafiltrationPaused.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml</file>
         <file alias="TreatmentAdjustmentPressuresLimits.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml</file>