Index: sources/gui/qml/main.qml
===================================================================
diff -u -rea225816887fd5bf505727812721fd4531d3e125 -r71c0c7aaf87975e585e86c64e63b11b47de4b2ed
--- sources/gui/qml/main.qml	(.../main.qml)	(revision ea225816887fd5bf505727812721fd4531d3e125)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 71c0c7aaf87975e585e86c64e63b11b47de4b2ed)
@@ -347,15 +347,15 @@
     }
 
     // keyboard should always be before AlarmItem to not to covet it.
-    KeyboardItem        { id: _keyboard                    }
+    KeyboardItem                { id: _keyboard                    }
 
-    WiFiDialog          { id: _wifiDialog                  }
-    InformationDialog   { id: _informationDialog           }
-    LockDialog          { id: _lockDialog                  }
-    AlarmItem           { id: _alarmItem        ;   z: 996 }
-    PowerItem           { id: _powerItem        ;   z: 997 }
-    ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
-    DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
+    HeaderbarDialogWiFi         { id: _wifiDialog                  }
+    HeaderbarDialogInformation  { id: _informationDialog           }
+    LockDialog                  { id: _lockDialog                  }
+    AlarmItem                   { id: _alarmItem        ;   z: 996 }
+    PowerItem                   { id: _powerItem        ;   z: 997 }
+    ConfirmDialog               { id: _confirmDialog    ;   z: 998 }
+    DiagnosticsDialog           { id: _diagnosticsDialog;   z: 999 }
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.