Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r821a3aca35299635f623a94f737f59728b924e2a -r0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 821a3aca35299635f623a94f737f59728b924e2a)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199)
@@ -143,6 +143,15 @@
                         enabled         : vDevice.wifiListEnabled
 
                         onPressed       : vDevice.wifiList = ""
+
+
+                        RotationAnimator on rotation {
+                            running : ! _refreshIcon.enabled
+                            from    : 0
+                            to      : 360
+                            loops   : Animation.Infinite
+                            duration: 7200
+                        }
                     }
                 }
 
@@ -151,7 +160,7 @@
                     height              : parent.height - _header.height
 
                     ListView    { id        : _networkList
-                        model               : vDevice.model
+                        model               : vDevice.wifiModel
                         clip                : true
                         width               : parent.width
                         height              : parent.height
@@ -245,53 +254,17 @@
         }
     }
 
-    ConfirmDialog   { id: _wifiConfirmDialog
-        property bool   isPassword              : false
-        property string ssid                    : ""
-        property string separator               : "\n"
-        readonly property string spaceSeparator : " "
-        height                      : Variables.completeDialogHeight - 130 // need to make room for keyboard
-        width                       : Variables.completeDialogWidth
-        y                           : 0
-        titleText                   : isPassword ? qsTr("Join ") + ssid :
-                                       qsTr("Disconnect ") + ssid
-        messageText                 : isPassword ? qsTr("Password") : qsTr("Do you want to disconnect from `%1`?").arg(ssid)
-        messageTextPixel            : Fonts.fontPixelTextRectExtra
-        footerBottomMargin          : Variables.defaultMargin * 2
+    ConfirmPasswordDialog { id: _wifiConfirmDialog
 
-        Item { id: _passwordItem
-            readonly    property string passwordCurrent : _passwordEntry.textInput.text
-            visible         : _wifiConfirmDialog.isPassword
-            anchors.centerIn: parent
-
-            TextEntry { id: _passwordEntry
-                clip                        : true
-                textInput   .width          : 450
-                textInput.inputMethodHints  : Qt.ImhNone
-                textInput.echoMode          : TextInput.Password
-                anchors.horizontalCenter    : parent.horizontalCenter
-                label.text                   : ""
-                label.width                  :  0
-                lengthMax                    : 30
-
-                onTextChanged: {
-                    // Replace non-ASCII characters as they are typed in
-                    var filtered = text.replace(/[^\x00-\x7F]/g, "")
-                    if (text !== filtered) { text = filtered }  // revert invalid characters
-                }
-            }
-
-            onVisibleChanged: if ( visible ) _passwordEntry.textInput.forceActiveFocus()
-        }
-
         onAccepted    : {
             if ( isPassword ) {
-                if(  _passwordItem.passwordCurrent.length > 0 ) {
-                    vDevice.doWifiConnect( true, ssid, _passwordItem.passwordCurrent )
+                if(  passwordLength > 0 ) {
+                    vDevice.doWifiConnect( true, ssid, password )
                 }
             } else {
                 vDevice.doWifiConnect( false, ssid, "" )
             }
         }
     }
+
 }