Merge branch 'feature/alternative-menubar-icons'

100 files changed, 30 insertions, 162 deletions

diff --git a/app/app.js b/app/app.js
index 5ac598c1b3..3352623dca 100644
--- a/app/app.js
+++ b/app/app.js
@@ -44,30 +44,18 @@ if(recentLocation && recentLocation.pathname) {
 }
 
 // Tray icon
-let isWindowVisible = false;
 
 /**
  * Get tray icon type based on connection state
  * @param    {ConnectionState} s - connection state
- * @return   {Object}
- * @property {TrayIconType} type    - icon type
- * @property {bool} [skipAnimation] - skip animation?
+ * @return   {TrayIconType}
  * 
  */
-const getChangeIconEventData = (s) => {
+const getIconType = (s) => {
   switch(s) {
-  case ConnectionState.connected: 
-    return { type: TrayIconType.secured };
-
-  case ConnectionState.connecting:
-    // do not display spinner if window is visible
-    if(isWindowVisible) {
-      return { type: TrayIconType.unsecured, skipAnimation: true };
-    } else {
-      return { type: TrayIconType.securing };
-    }
-
-  default: return { type: TrayIconType.unsecured };
+  case ConnectionState.connected: return TrayIconType.secured;
+  case ConnectionState.connecting: return TrayIconType.securing;
+  default: return TrayIconType.unsecured;
   }
 };
 
@@ -76,21 +64,9 @@ const getChangeIconEventData = (s) => {
  */
 const updateTrayIcon = () => {
   const { connect } = store.getState();
-  ipcRenderer.send('changeTrayIcon', getChangeIconEventData(connect.status));
+  ipcRenderer.send('changeTrayIcon', getIconType(connect.status));
 };
 
-ipcRenderer.on('showWindow', () => {
-  isWindowVisible = true;
-  updateTrayIcon();
-  console.log('showWindow');
-});
-
-ipcRenderer.on('hideWindow', () => {
-  isWindowVisible = false;
-  updateTrayIcon();
-  console.log('hideWindow');
-});
-
 // patch backend
 backend.syncWithReduxStore(store);
 
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png
deleted file mode 100644
index 1723ee998c..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png
deleted file mode 100644
index 61b2e295c7..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png
deleted file mode 100644
index 9156a48bc8..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png
deleted file mode 100644
index 46bb16c23f..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png
deleted file mode 100644
index d1e74a8e76..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png
deleted file mode 100644
index 1877a14681..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png
deleted file mode 100644
index 7e12450935..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png
deleted file mode 100644
index 53e3df70a0..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png
deleted file mode 100644
index e75fb69bc2..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png
deleted file mode 100644
index 0ef78a8ece..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png
deleted file mode 100644
index 17e2c699cc..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png
deleted file mode 100644
index e9c25388c6..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png
deleted file mode 100644
index 6b6c129018..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png
deleted file mode 100644
index e4dae6ac15..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png
deleted file mode 100644
index 31407842d2..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png
deleted file mode 100644
index 2dcb3a9293..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png
deleted file mode 100644
index 3d0e7cbebe..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png
deleted file mode 100644
index 4c37a80b69..0000000000
--- a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark.png
deleted file mode 100644
index 882a7cc8ce..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark@2x.png
deleted file mode 100644
index 6f859bab44..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-1-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark.png
deleted file mode 100644
index cdab95e22b..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark@2x.png
deleted file mode 100644
index d2b6ff7449..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-2-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark.png
deleted file mode 100644
index 8306d035ed..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark@2x.png
deleted file mode 100644
index fe7b74a393..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-3-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark.png
deleted file mode 100644
index b0263373c6..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark@2x.png
deleted file mode 100644
index 2b17e41d53..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-4-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark.png
deleted file mode 100644
index e1640ddbec..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark@2x.png
deleted file mode 100644
index 2b3e8e59e9..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-5-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark.png
deleted file mode 100644
index f35ccb57bf..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark@2x.png
deleted file mode 100644
index d8d3784cb5..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-6-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark.png
deleted file mode 100644
index 608e189097..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark@2x.png
deleted file mode 100644
index cd5807fbbb..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-7-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark.png
deleted file mode 100644
index 58459e5614..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark@2x.png
deleted file mode 100644
index 4dcaf3fe13..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-8-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark.png
deleted file mode 100644
index 9d1e2a40ee..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark@2x.png b/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark@2x.png
deleted file mode 100644
index 34184758e5..0000000000
--- a/app/assets/images/menubar icons/dark ui/spinner/spinner-9-dark@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-1-light.png b/app/assets/images/menubar icons/light ui/lock/lock-1-light.png
deleted file mode 100644
index 054bde16f7..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-1-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png
deleted file mode 100644
index 566bc576b9..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-2-light.png b/app/assets/images/menubar icons/light ui/lock/lock-2-light.png
deleted file mode 100644
index 01dc73ea65..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-2-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png
deleted file mode 100644
index 78a0cb2d21..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-3-light.png b/app/assets/images/menubar icons/light ui/lock/lock-3-light.png
deleted file mode 100644
index c90a1b8eb6..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-3-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png
deleted file mode 100644
index 58a82c5c96..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-4-light.png b/app/assets/images/menubar icons/light ui/lock/lock-4-light.png
deleted file mode 100644
index 7cd03273d7..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-4-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png
deleted file mode 100644
index c57439377f..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-5-light.png b/app/assets/images/menubar icons/light ui/lock/lock-5-light.png
deleted file mode 100644
index 8b080a1f5d..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-5-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png
deleted file mode 100644
index ea4b209a04..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-6-light.png b/app/assets/images/menubar icons/light ui/lock/lock-6-light.png
deleted file mode 100644
index c45d8fb4ac..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-6-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png
deleted file mode 100644
index b9adddac5f..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-7-light.png b/app/assets/images/menubar icons/light ui/lock/lock-7-light.png
deleted file mode 100644
index 009d2581df..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-7-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png
deleted file mode 100644
index d8e07a425d..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-8-light.png b/app/assets/images/menubar icons/light ui/lock/lock-8-light.png
deleted file mode 100644
index 8802dccb62..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-8-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png
deleted file mode 100644
index b20caa2c5c..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-9-light.png b/app/assets/images/menubar icons/light ui/lock/lock-9-light.png
deleted file mode 100644
index 8c89be3bba..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-9-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png
deleted file mode 100644
index d8b7b266a2..0000000000
--- a/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-1-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-1-light.png
deleted file mode 100644
index 1a28ae1ad9..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-1-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-1-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-1-light@2x.png
deleted file mode 100644
index e1a23e70b6..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-1-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-2-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-2-light.png
deleted file mode 100644
index 9282590f52..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-2-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-2-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-2-light@2x.png
deleted file mode 100644
index 8f713ef989..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-2-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-3-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-3-light.png
deleted file mode 100644
index eba066ea6c..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-3-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-3-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-3-light@2x.png
deleted file mode 100644
index b1b8ea57dd..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-3-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-4-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-4-light.png
deleted file mode 100644
index 5015b61d42..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-4-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-4-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-4-light@2x.png
deleted file mode 100644
index 5ba6bc04e0..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-4-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-5-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-5-light.png
deleted file mode 100644
index 3d32cd6de6..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-5-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-5-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-5-light@2x.png
deleted file mode 100644
index c5a3408e55..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-5-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-6-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-6-light.png
deleted file mode 100644
index 93dbbd41d4..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-6-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-6-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-6-light@2x.png
deleted file mode 100644
index 128d91eeef..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-6-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-7-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-7-light.png
deleted file mode 100644
index a92bd1d5bf..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-7-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-7-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-7-light@2x.png
deleted file mode 100644
index 4fd0135ca5..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-7-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-8-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-8-light.png
deleted file mode 100644
index 39d83adace..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-8-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-8-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-8-light@2x.png
deleted file mode 100644
index 3a799dd816..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-8-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-9-light.png b/app/assets/images/menubar icons/light ui/spinner/spinner-9-light.png
deleted file mode 100644
index d1a781c091..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-9-light.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/light ui/spinner/spinner-9-light@2x.png b/app/assets/images/menubar icons/light ui/spinner/spinner-9-light@2x.png
deleted file mode 100644
index 8e41c9cd57..0000000000
--- a/app/assets/images/menubar icons/light ui/spinner/spinner-9-light@2x.png
+++ /dev/null
diff --git a/app/assets/images/menubar icons/lock-1.png b/app/assets/images/menubar icons/lock-1.png
new file mode 100644
index 0000000000..b20bc19515
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-1.png
diff --git a/app/assets/images/menubar icons/lock-1@2x.png b/app/assets/images/menubar icons/lock-1@2x.png
new file mode 100644
index 0000000000..1c512d12bd
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-1@2x.png
diff --git a/app/assets/images/menubar icons/lock-2.png b/app/assets/images/menubar icons/lock-2.png
new file mode 100644
index 0000000000..d98d05d951
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-2.png
diff --git a/app/assets/images/menubar icons/lock-2@2x.png b/app/assets/images/menubar icons/lock-2@2x.png
new file mode 100644
index 0000000000..c92dec19ec
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-2@2x.png
diff --git a/app/assets/images/menubar icons/lock-3.png b/app/assets/images/menubar icons/lock-3.png
new file mode 100644
index 0000000000..871f8402bf
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-3.png
diff --git a/app/assets/images/menubar icons/lock-3@2x.png b/app/assets/images/menubar icons/lock-3@2x.png
new file mode 100644
index 0000000000..d961af45f3
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-3@2x.png
diff --git a/app/assets/images/menubar icons/lock-4.png b/app/assets/images/menubar icons/lock-4.png
new file mode 100644
index 0000000000..6fcb60c663
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-4.png
diff --git a/app/assets/images/menubar icons/lock-4@2x.png b/app/assets/images/menubar icons/lock-4@2x.png
new file mode 100644
index 0000000000..f67b4c0921
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-4@2x.png
diff --git a/app/assets/images/menubar icons/lock-5.png b/app/assets/images/menubar icons/lock-5.png
new file mode 100644
index 0000000000..43d02ab1e0
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-5.png
diff --git a/app/assets/images/menubar icons/lock-5@2x.png b/app/assets/images/menubar icons/lock-5@2x.png
new file mode 100644
index 0000000000..1f05adf802
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-5@2x.png
diff --git a/app/assets/images/menubar icons/lock-6.png b/app/assets/images/menubar icons/lock-6.png
new file mode 100644
index 0000000000..e282ff8dad
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-6.png
diff --git a/app/assets/images/menubar icons/lock-6@2x.png b/app/assets/images/menubar icons/lock-6@2x.png
new file mode 100644
index 0000000000..f76ab999f1
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-6@2x.png
diff --git a/app/assets/images/menubar icons/lock-7.png b/app/assets/images/menubar icons/lock-7.png
new file mode 100644
index 0000000000..1299817a53
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-7.png
diff --git a/app/assets/images/menubar icons/lock-7@2x.png b/app/assets/images/menubar icons/lock-7@2x.png
new file mode 100644
index 0000000000..f3a1428ad4
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-7@2x.png
diff --git a/app/assets/images/menubar icons/lock-8.png b/app/assets/images/menubar icons/lock-8.png
new file mode 100644
index 0000000000..161e4f5e82
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-8.png
diff --git a/app/assets/images/menubar icons/lock-8@2x.png b/app/assets/images/menubar icons/lock-8@2x.png
new file mode 100644
index 0000000000..5b12910e4a
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-8@2x.png
diff --git a/app/assets/images/menubar icons/lock-9.png b/app/assets/images/menubar icons/lock-9.png
new file mode 100644
index 0000000000..c823aa87a1
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-9.png
diff --git a/app/assets/images/menubar icons/lock-9@2x.png b/app/assets/images/menubar icons/lock-9@2x.png
new file mode 100644
index 0000000000..e4dc28a192
--- /dev/null
+++ b/app/assets/images/menubar icons/lock-9@2x.png
diff --git a/app/assets/images/tray-icon-connected.png b/app/assets/images/tray-icon-connected.png
deleted file mode 100644
index 8b0cc6d193..0000000000
--- a/app/assets/images/tray-icon-connected.png
+++ /dev/null
diff --git a/app/assets/images/tray-icon-connected@2x.png b/app/assets/images/tray-icon-connected@2x.png
deleted file mode 100644
index 6c66e8534d..0000000000
--- a/app/assets/images/tray-icon-connected@2x.png
+++ /dev/null
diff --git a/app/assets/images/tray-icon-default.png b/app/assets/images/tray-icon-default.png
deleted file mode 100644
index 94c6fc9b0f..0000000000
--- a/app/assets/images/tray-icon-default.png
+++ /dev/null
diff --git a/app/assets/images/tray-icon-default@2x.png b/app/assets/images/tray-icon-default@2x.png
deleted file mode 100644
index dfc1f770a0..0000000000
--- a/app/assets/images/tray-icon-default@2x.png
+++ /dev/null
diff --git a/app/lib/tray-icon-manager.js b/app/lib/tray-icon-manager.js
index e22ac231f2..987698a23d 100644
--- a/app/lib/tray-icon-manager.js
+++ b/app/lib/tray-icon-manager.js
@@ -26,8 +26,6 @@ export default class TrayIconManager {
     this._iconProvider = iconProvider;
     this._animator = null;
     this._iconType = null;
-    
-    iconProvider.on(TrayIconProvider.EventType.themeChanged, this._onThemeChange);
   }
 
   /**
@@ -40,15 +38,6 @@ export default class TrayIconManager {
       this._animator = null;
     }
     this._iconType = null;
-    this._iconProvider.removeListener(TrayIconProvider.EventType.themeChanged, this._onThemeChange);
-  }
-
-  /**
-   * Event handler for notification when menubar theme is changed.
-   * @memberOf TrayIconManager
-   */
-  _onThemeChange = () => {
-    this._updateType(this._iconType, true);
   }
 
   /**
@@ -66,7 +55,7 @@ export default class TrayIconManager {
    * @memberOf TrayIconManager
    */
   set iconType(type) {
-    this.updateIconType(type, false);
+    this._updateIconType(type);
   }
 
   /**
@@ -78,12 +67,20 @@ export default class TrayIconManager {
    * 
    * @memberOf TrayIconManager
    */
-  updateIconType(type, skipAnimation) {
+   _updateIconType(type) {
     // no-op if same animator requested
     if(this._iconType === type) { return; }
 
+    // skip animation if:
+    // 1. there was no icon set before (which is usually when app starts)
+    // 2. unsecured -> securing
+    // 3. securing -> unsecured
+    const skip = this._iconType === null || 
+                 type === TrayIconType.securing || // unsecured -> securing
+                 (type === TrayIconType.unsecured && this._iconType === TrayIconType.securing); // securing -> unsecured
+
     // do not animate if setting icon for the first time
-    this._updateType(type, this._iconType === null || skipAnimation);
+    this._updateType(type, skip);
   }
 
   /**
@@ -98,7 +95,7 @@ export default class TrayIconManager {
     switch(type) {
     case TrayIconType.secured: return this._iconProvider.lockAnimation();
     case TrayIconType.unsecured: return this._iconProvider.unlockAnimation();
-    case TrayIconType.securing: return this._iconProvider.spinnerAnimation();
+    case TrayIconType.securing: return this._iconProvider.unlockAnimation();
     }
   }
 
@@ -121,19 +118,10 @@ export default class TrayIconManager {
       this._animator = null;
     }
 
-    switch(type) {
-    case TrayIconType.secured:
-    case TrayIconType.unsecured:
-      if(skipAnimation) {
-        animator.advanceToEnd();
-      } else {
-        animator.start();
-      }
-      break;
-
-    case TrayIconType.securing:
+    if(skipAnimation) {
+      animator.advanceToEnd();
+    } else {
       animator.start();
-      break;
     }
 
     this._animator = animator;
diff --git a/app/lib/tray-icon-provider.js b/app/lib/tray-icon-provider.js
index 66f926a8c6..aa50a71a71 100644
--- a/app/lib/tray-icon-provider.js
+++ b/app/lib/tray-icon-provider.js
@@ -1,19 +1,11 @@
 import path from 'path';
 import { EventEmitter } from 'events';
-import { systemPreferences } from 'electron';
 import TrayAnimation from './tray-animation';
 import Enum from './enum';
 
 const menubarIcons = {
   base: path.join(path.resolve(__dirname, '..'), 'assets/images/menubar icons'),
-  spinner: {
-    light: 'light ui/spinner/spinner-{s}-light.png',
-    dark: 'dark ui/spinner/spinner-{s}-dark.png'
-  },
-  lock: {
-    light: 'light ui/lock/lock-{s}-light.png',
-    dark: 'dark ui/lock/lock-{s}-dark.png'
-  }
+  lock: 'lock-{s}.png'
 };
 
 /**
@@ -22,39 +14,7 @@ const menubarIcons = {
  * @export
  * @class TrayIconProvider
  */
-export default class TrayIconProvider extends EventEmitter {
-  
-  /**
-   * EventType
-   * @type {TrayIconProvider.EventType}
-   * @property {string} themeChanged - event fired when menubar theme is changed
-   */
-  static EventType = new Enum('themeChanged');
-
-  /**
-   * Creates an instance of TrayIconProvider.
-   * 
-   * @memberOf TrayIconProvider
-   */
-  constructor() {
-    super();
-
-    this._themeChangeObserver = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
-      this.emit(TrayIconProvider.EventType.themeChanged);
-    });
-  }
-
-  /**
-   * Destroys TrayIconProvider
-   * 
-   * @memberOf TrayIconProvider
-   */
-  destroy() {
-    if(this._themeChangeObserver) {
-      systemPreferences.unsubscribeNotification(this._themeChangeObserver);
-      this._themeChangeObserver = null;
-    }
-  }
+export default class TrayIconProvider {
 
   /**
    * Get lock animation
@@ -65,7 +25,8 @@ export default class TrayIconProvider extends EventEmitter {
    * @memberOf TrayIconProvider
    */
   lockAnimation(isReverse = false) {
-    let animation = TrayAnimation.fromFileSequence(this._lockPath, [1, 9]);
+    let filePath = path.join(menubarIcons.base, menubarIcons.lock);
+    let animation = TrayAnimation.fromFileSequence(filePath, [1, 9]);
     animation.speed = 100;
     animation.reverse = isReverse;
 
@@ -83,52 +44,4 @@ export default class TrayIconProvider extends EventEmitter {
     return this.lockAnimation(true);
   }
 
-  /**
-   * Get spinner animation
-   * 
-   * @returns TrayIconAnimator
-   * 
-   * @memberOf TrayIconProvider
-   */
-  spinnerAnimation() {
-    let animation = TrayAnimation.fromFileSequence(this._spinnerPath, [1, 9]);
-    animation.speed = 100;
-    animation.repeat = true;
-
-    return animation;
-  }
-
-  /**
-   * Pattern to spinner animation assets based on macOS menubar theme
-   * 
-   * @readonly
-   * 
-   * @memberOf TrayIconProvider
-   */
-  get _spinnerPath() {
-    return path.join(menubarIcons.base, menubarIcons.spinner[this._colorTheme]);
-  }
-  
-  /**
-   * Pattern to lock/unlock animation assets based on macOS menubar theme
-   * 
-   * @readonly
-   * 
-   * @memberOf TrayIconProvider
-   */
-  get _lockPath() {
-    return path.join(menubarIcons.base, menubarIcons.lock[this._colorTheme]);
-  }
-
-  /**
-   * Current theme name based on macOS menubar theme.
-   * 
-   * @readonly
-   * 
-   * @memberOf TrayIconProvider
-   */
-  get _colorTheme() {
-    return systemPreferences.isDarkMode() ? 'dark' : 'light';
-  }
-
 }
\ No newline at end of file
diff --git a/app/main.js b/app/main.js
index 80cc626e4d..374ece212b 100644
--- a/app/main.js
+++ b/app/main.js
@@ -32,8 +32,8 @@ const stopTrayEventMonitor = () => {
   }
 };
 
-ipcMain.on('changeTrayIcon', (event, data) => {
-  trayIconManager.updateIconType(data.type, data.skipAnimation);
+ipcMain.on('changeTrayIcon', (event, type) => {
+  trayIconManager.iconType = type;
 });
 
 ipcMain.emit();
@@ -132,18 +132,10 @@ const createWindow = () => {
 
   window.on('show', () => {
     startTrayEventMonitor(window);
-
-    tray.setHighlightMode('always');
-
-    window.webContents.send('showWindow');
   });
 
   window.on('hide', () => {
     stopTrayEventMonitor();
-    
-    tray.setHighlightMode('never');
-
-    window.webContents.send('hideWindow');
   });
 
 };
@@ -165,9 +157,8 @@ const showWindow = () => {
 
 const createTray = () => {
   tray = new Tray(nativeImage.createEmpty());
-  tray.on('right-click', toggleWindow);
-  tray.on('double-click', toggleWindow);
   tray.on('click', toggleWindow);
+  tray.setHighlightMode('selection');
   
   trayIconManager = new TrayIconManager(tray, new TrayIconProvider());
 };
diff --git a/distribution.yml b/distribution.yml
index 5fc2f9e8d4..0851eabd6b 100644
--- a/distribution.yml
+++ b/distribution.yml
@@ -2,7 +2,7 @@ appId: net.mullvad.vpn
 copyright: Amagicom AB
 productName: MullvadNeue
 
-asar: true
+asar: false
 
 directories:
   buildResources: build-assets/
diff --git a/package.json b/package.json
index b57ff2f93d..77cb11e7f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Mullvad",
   "main": "init.js",
   "author": {