4 files changed, 11 insertions, 11 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index ce8999c3..9fc36876 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -24,10 +24,10 @@ template(name="boardHeaderBar")
             i.fa.fa-eye
             span {{_ 'watching'}}
           if $eq watchLevel "tracking"
-            i.fa.fa-user
+            i.fa.fa-bell
             span {{_ 'tracking'}}
           if $eq watchLevel "muted"
-            i.fa.fa-times-circle
+            i.fa.fa-bell-slash
             span {{_ 'muted'}}
 
   .board-header-btns.right
@@ -50,10 +50,10 @@ template(name="boardHeaderBar")
             i.fa.fa-eye
             span {{_ 'watching'}}
           if $eq watchLevel "tracking"
-            i.fa.fa-user
+            i.fa.fa-bell
             span {{_ 'tracking'}}
           if $eq watchLevel "muted"
-            i.fa.fa-times-circle
+            i.fa.fa-bell-slash
             span {{_ 'muted'}}
 
     a.board-header-btn.js-open-filter-view(
@@ -132,7 +132,7 @@ template(name="boardChangeWatchPopup")
     li
       with "tracking"
         a.js-select-watch
-          i.fa.fa-user.colorful
+          i.fa.fa-bell.colorful
           | {{_ 'tracking'}}
           if watchCheck
             i.fa.fa-check
@@ -140,7 +140,7 @@ template(name="boardChangeWatchPopup")
     li
       with "muted"
         a.js-select-watch
-          i.fa.fa-times-circle.colorful
+          i.fa.fa-bell-slash.colorful
           | {{_ 'muted'}}
           if watchCheck
             i.fa.fa-check
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 055b6f27..9ed27406 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -43,7 +43,7 @@ Template.boardChangeTitlePopup.events({
 BlazeComponent.extendComponent({
   watchLevel() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return currentBoard.getWatchLevel(Meteor.userId());
+    return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
   },
 
   isStarred() {
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index 7ab4d8ce..e8d9ab5d 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -276,13 +276,13 @@ kbd
 .fa.fa-times-thin:before
   content: '\00d7';
 
-.fa.fa-globe.colorful
+.fa.fa-globe.colorful, .fa.fa-bell.colorful
   color: #4caf50
 
-.fa.fa-lock.colorful, .fa.fa-times-circle.colorful
+.fa.fa-lock.colorful, .fa.fa-bell-slash.colorful
   color: #f44336
 
-.fa.fa-user.colorful, .fa.fa-eye.colorful, .fa.fa-circle.colorful
+.fa.fa-eye.colorful
   color: #4336f4
 
 .pop-over .pop-over-list li a:not(.disabled):hover
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index cae768fb..a71e7fc7 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -44,7 +44,7 @@ template(name="editNotificationPopup")
         span.sub-name {{_ 'notify-watch'}}
     li
       a.js-toggle-tag-notify-participate
-        i.fa.fa-user.colorful
+        i.fa.fa-bell.colorful
         | {{_ 'tracking'}}
         if hasTag "notify-participate"
           i.fa.fa-check