Index: sources/gui/qml/WifiStatusIndicator.qml
===================================================================
diff -u -r6f66ec07cf63341336ec82f0d26874087007e814 -r06152733946baf8da998803721e9013f48078f48
--- sources/gui/qml/WifiStatusIndicator.qml	(.../WifiStatusIndicator.qml)	(revision 6f66ec07cf63341336ec82f0d26874087007e814)
+++ sources/gui/qml/WifiStatusIndicator.qml	(.../WifiStatusIndicator.qml)	(revision 06152733946baf8da998803721e9013f48078f48)
@@ -60,40 +60,33 @@
         source          : _wifiStatusRoot.isConnected ? "qrc:/images/WifiLogoConnected" : "qrc:/images/WifiLogoNotConnected"
     }
 
-    Text { id: _wifiIndicatorLabel
-        visible : true
-        anchors.top: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        color   : Colors.white
-        text    : qsTr("Wifi")
-        font.pixelSize: 12
-        font.bold: true
-    }
-
     onClicked: if(displayInformation) _wifiInfoDialog.open()
 
     Item {
         // To allow better positioning control, wrapping ModalDialog in Item
-        anchors.right : _wifiStatusRoot.right
-        anchors.top   : _wifiStatusRoot.bottom
+        anchors {
+            top         : _wifiStatusRoot.bottom
+            topMargin   : Variables.dialogSpaceFromIcon
+
+            right       : _wifiStatusRoot.right
+        }
+
         width : _wifiInfoDialog.width
         height: _wifiInfoDialog.height
 
         StatusDialog{ id: _wifiInfoDialog
             dialogTitleText : qsTr("Wifi Info")
             infoLabels      : [
-                qsTr("SSID"         ),
-                qsTr("IP Address"   ),
-                qsTr("Gateway"      ),
-                qsTr("Subnet Mask"  ),
-                qsTr("DNS")
+                qsTr("SSID"                 ),
+                qsTr("IP Address"           ),
+                qsTr("Signal Strength Level"),
+                qsTr("Security Type"        )
             ]
             statusInfo      : [
-                vNetwork.ssid       ,
-                vNetwork.ipAddress  ,
-                vNetwork.gateway    ,
-                vNetwork.subnetMask ,
-                vNetwork.DNS
+                vNetwork.ssid                ,
+                vNetwork.ipAddress           ,
+                vNetwork.wifiSignalStrength  ,
+                vNetwork.wifiSecurityType
             ]
         }
     }