Merge branch 'master' of git://github.com/spesmilo/electrum

gui/qt/main_window.py

@@ -660,7 +660,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
                 # append fiat balance and price
                 if self.fx.is_enabled():
                     text += self.fx.get_fiat_status_text(c + u + x) or ''
-                icon = QIcon(":icons/status_connected.png")
+                if not self.network.proxy:
+                    icon = QIcon(":icons/status_connected.png")
+                else:
+                    icon = QIcon(":icons/status_connected_proxy.png")
         else:
             text = _("Not connected")
             icon = QIcon(":icons/status_disconnected.png")

icons.qrc

@@ -26,6 +26,7 @@
     <file>icons/preferences.png</file>
     <file>icons/seed.png</file>
     <file>icons/status_connected.png</file>
+    <file>icons/status_connected_proxy.png</file>
     <file>icons/status_disconnected.png</file>
     <file>icons/status_waiting.png</file>
     <file>icons/status_lagging.png</file>