diff --git a/icons/electrum.ico b/icons/electrum.ico
index 318a1c40..3b4d53a0 100644
Binary files a/icons/electrum.ico and b/icons/electrum.ico differ
diff --git a/icons/electrum.png b/icons/electrum.png
index a9804330..e07a7dc0 100644
Binary files a/icons/electrum.png and b/icons/electrum.png differ
diff --git a/lib/network.py b/lib/network.py
index 660533bc..2b33427e 100644
--- a/lib/network.py
+++ b/lib/network.py
@@ -378,7 +378,7 @@ class Network(threading.Thread):
                 i, response = self.queue.get(timeout=0.1)
             except Queue.Empty:
 
-                if len(self.interfaces) < self.num_server:
+                if len(self.interfaces) + len(self.pending_servers) < self.num_server:
                     self.start_random_interface()
                 if not self.interfaces:
                     if time.time() - self.disconnected_time > DISCONNECTED_RETRY_INTERVAL:
diff --git a/setup.py b/setup.py
index dda86622..31d2891f 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ data_files += [
     ])
 ]
 
-# replace tlslite
+# replace tlslite because of https://github.com/trevp/tlslite/issues/15
 os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
 
 setup(