diff --git a/src/browser/main/config/states.js b/src/browser/main/config/states.js
index d84f2f7e..56bf2230 100644
--- a/src/browser/main/config/states.js
+++ b/src/browser/main/config/states.js
@@ -1,6 +1,21 @@
 /* global angular */
 angular.module('codexen')
-  .config(function ($stateProvider, $urlRouterProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $httpProvider) {
+    $httpProvider.interceptors.push(function ($q, $injector) {
+      return {
+        responseError: function (res) {
+          switch (res.status) {
+            case 401:
+              var $state = $injector.get('$state')
+              $state.go('auth.signin')
+              break
+          }
+
+          return $q.reject(res)
+        }
+      }
+    })
+
     $urlRouterProvider
       .when('/auth', '/auth/register')
       .when('/auth/', '/auth/register')
diff --git a/src/browser/main/index.html b/src/browser/main/index.html
index 3e36c3fc..0a1985d4 100644
--- a/src/browser/main/index.html
+++ b/src/browser/main/index.html
@@ -38,8 +38,6 @@
     <script src="app.js"></script>
     <script src="config/states.js"></script>
     <script src="controllers/AppController.js"></script>
-    <script src="filters/from-now.js"></script>
-    <script src="filters/search-snippets.js"></script>
     <script src="directives/btn-delete-snippet.js"></script>
     <script src="directives/btn-edit-snippet.js"></script>
     <script src="directives/btn-new-snippet.js"></script>
@@ -47,20 +45,22 @@
     <script src="directives/snippet-item.js"></script>
     <script src="directives/tag-item.js"></script>
     <script src="directives/tag-list.js"></script>
+    <script src="filters/from-now.js"></script>
+    <script src="filters/search-snippets.js"></script>
     <script src="services/Modal.js"></script>
     <script src="services/Settings.js"></script>
     <script src="services/Tag.js"></script>
     <script src="services/User.js"></script>
     <script src="controllers/directives/SideNavController.js"></script>
-    <script src="controllers/modals/DeleteSnippetModalController.js"></script>
-    <script src="controllers/modals/EditSnippetModalController.js"></script>
-    <script src="controllers/modals/NewSnippetModalController.js"></script>
     <script src="controllers/states/AuthRegisterController.js"></script>
     <script src="controllers/states/AuthSignInController.js"></script>
     <script src="controllers/states/HomeController.js"></script>
     <script src="controllers/states/SettingsController.js"></script>
     <script src="controllers/states/SnippetsDetailController.js"></script>
     <script src="controllers/states/SnippetsListController.js"></script>
+    <script src="controllers/modals/DeleteSnippetModalController.js"></script>
+    <script src="controllers/modals/EditSnippetModalController.js"></script>
+    <script src="controllers/modals/NewSnippetModalController.js"></script>
     <script src="../shared/shared.js"></script>
     <script src="../shared/config/ace.js"></script>
     <script src="../shared/config/env.js"></script>
diff --git a/src/browser/shared/config/satellizer.js b/src/browser/shared/config/satellizer.js
index b7717dc7..ca15816a 100644
--- a/src/browser/shared/config/satellizer.js
+++ b/src/browser/shared/config/satellizer.js
@@ -1,29 +1,8 @@
 /* global angular */
 angular.module('codexen.shared')
-  .config(function ($authProvider, $httpProvider, apiUrl, appName) {
+  .config(function ($authProvider, $httpProvider, apiUrl) {
     $authProvider.baseUrl = apiUrl
 
     $httpProvider.defaults.useXDomain = true
     delete $httpProvider.defaults.headers.common['X-Requested-With']
-    $httpProvider.interceptors.push(function ($q, $injector) {
-      return {
-        responseError: function (res) {
-          switch (res.status) {
-            case 401:
-              switch (appName) {
-                case 'main' :
-                  var $state = $injector.get('$state')
-                  $state.go('auth.signin')
-                  break
-                case 'popup' :
-                  // TODO: hide popup
-                  break
-              }
-              break
-          }
-
-          return $q.reject(res)
-        }
-      }
-    })
   })
diff --git a/src/tray-icon.png b/src/tray-icon.png
index c615b960..fde41991 100644
Binary files a/src/tray-icon.png and b/src/tray-icon.png differ
diff --git a/src/tray-icon@2x.png b/src/tray-icon@2x.png
new file mode 100644
index 00000000..c615b960
Binary files /dev/null and b/src/tray-icon@2x.png differ
diff --git a/src/tray-icon@4x.png b/src/tray-icon@4x.png
new file mode 100644
index 00000000..25c9f14b
Binary files /dev/null and b/src/tray-icon@4x.png differ