Index: leahi.qrc
===================================================================
diff -u -r37d205586674df8b2b50fed94336c6d7f0d8481a -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- leahi.qrc	(.../leahi.qrc)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
+++ leahi.qrc	(.../leahi.qrc)	(revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -44,8 +44,8 @@
     </qresource>
     <qresource prefix="/dialogs/headerbar">
         <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.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="HeaderbarStorage.qml">sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml</file>
+        <file alias="HeaderbarSettings.qml">sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
     <qresource prefix="/images">
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r37d205586674df8b2b50fed94336c6d7f0d8481a -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -122,7 +122,6 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
-
             onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
@@ -149,15 +148,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
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r37d205586674df8b2b50fed94336c6d7f0d8481a -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -333,8 +333,8 @@
     KeyboardItem            { id: _keyboard                    }
 
     HeaderbarWiFi           { id: _headerbarWifi               }
-    StorageDialog       { id: _storageDialog               }
-    SettingsDialog      { id: _settingsDialog              }
+    HeaderbarStorage        { id: _headerbarStorage            }
+    HeaderbarSettings       { id: _headerbarSettings           }
     HeaderbarInformation    { id: _headerbarInformation        }
     LockDialog              { id: _lockDialog                  }
     AlarmItem               { id: _alarmItem        ;   z: 996 }