4 files changed, 8 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 776323bc..6dd28f04 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -613,7 +613,7 @@ class MainWindow(QtGui.QMainWindow):
             self.tr("Hide Main Window"))[int(visible)]
 
         # set labels
-        visible = self.isVisible()
+        visible = self.isVisible() and self.isActiveWindow()
         self._action_visible.setText(get_action(visible))
 
     def _toggle_visible(self):
@@ -623,8 +623,10 @@ class MainWindow(QtGui.QMainWindow):
 
         Toggles the window visibility
         """
-        if not self.isVisible():
+        visible = self.isVisible() and self.isActiveWindow()
+        if not visible:
             self.show()
+            self.activateWindow()
             self.raise_()
         else:
             self.hide()
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index a8f66bbc..5e0108dc 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -771,7 +771,7 @@
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/leap-color-big.png</pixmap>
+       <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap>
       </property>
      </widget>
     </item>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index fe653e91..ed6c1da0 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -77,7 +77,7 @@ class Wizard(QtGui.QWizard):
         self.ui.setupUi(self)
 
         self.setPixmap(QtGui.QWizard.LogoPixmap,
-                       QtGui.QPixmap(":/images/leap-color-small.png"))
+                       QtGui.QPixmap(":/images/mask-icon.png"))
 
         self.QUESTION_ICON = QtGui.QPixmap(":/images/Emblem-question.png")
         self.ERROR_ICON = QtGui.QPixmap(":/images/Dialog-error.png")
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 7c46ee0a..831c6a1c 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -223,8 +223,8 @@ def _darwin_has_tun_kext():
     """
     # XXX we should be smarter here and use kextstats output.
 
-    has_kext = os.path.isdir("/System/Library/Extensions/tun.kext")
-    has_startup = os.path.isdir("/System/Library/StartupItems/tun")
+    has_kext = os.path.isdir("/Library/Extensions/tun.kext")
+    has_startup = os.path.isdir("/Library/StartupItems/tun")
     has_tun_and_startup = has_kext and has_startup
     logger.debug(
         'platform initializer check: has tun_and_startup = %s' %