diff --git a/js/compact-boardlist.js b/js/compact-boardlist.js
index a6a72aec..47fdf5ac 100644
--- a/js/compact-boardlist.js
+++ b/js/compact-boardlist.js
@@ -27,7 +27,7 @@ if (device_type == 'desktop') {
       }
       else if (item.name.match(/^fa_/)) {
         var icon = item.name.replace(/^fa_/, '')
-        $('<a class="cb-item cb-fa" href="'+categories[i].boards[0].href+'"><i class="icon-'+icon+' icon"></i></a>')
+        $('<a class="cb-item cb-fa" href="'+categories[i].boards[0].href+'"><i class="fa-'+icon+' fa"></i></a>')
           .appendTo(topbl)
       }
       else {
@@ -47,7 +47,7 @@ if (device_type == 'desktop') {
 	        tag = $("<a href='"+board.href+"'><span>"+board.name+"</span><span class='cb-uri'>/"+board.uri+"/</span></a>")
 	      }
 	      else {
-	        tag = $("<a href='"+board.href+"'><span>"+board.uri+"</span><span class='cb-uri'><i class='icon icon-globe'></i></span></a>")
+	        tag = $("<a href='"+board.href+"'><span>"+board.uri+"</span><span class='cb-uri'><i class='fa fa-globe'></i></span></a>")
 	      }
 	      tag
 		.addClass("cb-menuitem")
diff --git a/js/watch.js b/js/watch.js
index 425bbe8f..734db040 100644
--- a/js/watch.js
+++ b/js/watch.js
@@ -84,7 +84,7 @@ $(function(){
       var newposts = "(0)";
       if (status && status[board] && status[board].threads && status[board].threads[tid]) {
         if (status[board].threads[tid] == -404) {
-          newposts = "<i class='icon icon-ban-circle'></i>";
+          newposts = "<i class='fa fa-ban-circle'></i>";
         }
         else {
           newposts = "("+status[board].threads[tid]+")";
@@ -97,7 +97,7 @@ $(function(){
 	tag.find(".watch-remove").mouseenter(function() {
           this.oldval = $(this).html();
           $(this).css("min-width", $(this).width());
-          $(this).html("<i class='icon icon-minus'></i>");
+          $(this).html("<i class='fa fa-minus'></i>");
         })
         .mouseleave(function() {
           $(this).html(this.oldval);
@@ -105,7 +105,7 @@ $(function(){
       }
       else if (variant == 'mobile') {
         tag = $("<a href='/"+board+"/res/"+tid+".html'><span>#"+tid+"</span><span class='cb-uri'>"+newposts+"</span>"
-               +"<span class='cb-uri watch-remove'><i class='icon icon-minus'></i></span>");	
+               +"<span class='cb-uri watch-remove'><i class='fa fa-minus'></i></span>");	
       }
 
       tag.attr('data-thread', tid)