Index: leahi.qrc
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -rb1611462da7580dc1eb5168d5054e31624a131ca
--- leahi.qrc	(.../leahi.qrc)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ leahi.qrc	(.../leahi.qrc)	(revision b1611462da7580dc1eb5168d5054e31624a131ca)
@@ -43,9 +43,9 @@
         <file alias="DiagnosticsDD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml</file>
     </qresource>
     <qresource prefix="/dialogs/headerbar">
-        <file alias="WiFiDialog.qml">sources/gui/qml/dialogs/headerbar/WiFiDialog.qml</file>
-        <file alias="StorageDialog.qml">sources/gui/qml/dialogs/headerbar/StorageDialog.qml</file>
-        <file alias="SettingsDialog.qml">sources/gui/qml/dialogs/headerbar/SettingsDialog.qml</file>
+        <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml</file>
+        <file alias="HeaderbarStorage.qml">sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml</file>
+        <file alias="HeaderbarSettings.qml">sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -rb1611462da7580dc1eb5168d5054e31624a131ca
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision b1611462da7580dc1eb5168d5054e31624a131ca)
@@ -136,7 +136,7 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
-            onPressed       : _wifiDialog.openDialog(_wifiButton)
+            onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
         IconButton { id  : _bluetoothButton
@@ -160,15 +160,15 @@
             iconImageSource : "qrc:/images/iStorage"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : _storageDialog.openDialog(_storageButton)
+            onPressed       : _headerbarStorage.openDialog(_storageButton)
         }
 
         IconButton { id  : _settingsButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iSettings"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : _settingsDialog.openDialog(_settingsButton)
+            onPressed       : _headerbarSettings.openDialog(_settingsButton)
         }
 
         IconButton { id  : _informationButton
Fisheye: Tag b1611462da7580dc1eb5168d5054e31624a131ca refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/SettingsDialog.qml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b1611462da7580dc1eb5168d5054e31624a131ca refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/StorageDialog.qml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b1611462da7580dc1eb5168d5054e31624a131ca refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/WiFiDialog.qml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -rb1611462da7580dc1eb5168d5054e31624a131ca
--- sources/gui/qml/main.qml	(.../main.qml)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision b1611462da7580dc1eb5168d5054e31624a131ca)
@@ -327,9 +327,9 @@
     // keyboard should always be before AlarmItem to not to covet it.
     KeyboardItem        { id: _keyboard                    }
 
-    WiFiDialog          { id: _wifiDialog                  }
-    StorageDialog       { id: _storageDialog               }
-    SettingsDialog      { id: _settingsDialog              }
+    HeaderbarWiFi       { id: _headerbarWifi               }
+    HeaderbarStorage    { id: _headerbarStorage            }
+    HeaderbarSettings   { id: _headerbarSettings           }
     LockDialog          { id: _lockDialog                  }
     AlarmItem           { id: _alarmItem        ;   z: 996 }
     PowerItem           { id: _powerItem        ;   z: 997 }