diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 9ff1ea8ce..6bc7c7770 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -220,7 +220,7 @@
             <span class="icon-bar"></span>
           </button>
         </div>
-		<button class="toggle-sidebar glyphicon glyphicon-chevron-left" style="display:none;"></button>
+        <button class="toggle-sidebar" style="display:none;"><i class="fa fa-chevron-left fa-chevron-right"></i></button>
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav navbar-right">
             <li id="menu_messages"><a href="#">{{session_username}}@{{system_hostname}}.{{system_domain}}</a></li>
diff --git a/src/opnsense/www/js/opnsense_theme.js b/src/opnsense/www/js/opnsense_theme.js
index f340e9fb2..9b79d8507 100644
--- a/src/opnsense/www/js/opnsense_theme.js
+++ b/src/opnsense/www/js/opnsense_theme.js
@@ -47,7 +47,7 @@ $(document).ready(function () {
         $(".toggle-sidebar").click(function () {
             $("#navigation").toggleClass("col-sidebar-left");
             $("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
-            $(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
+            $(".toggle-sidebar > i").toggleClass("fa-chevron-right fa-chevron-left");
             if ($("#navigation").hasClass("col-sidebar-left")) {
                 $(".brand-logo").css("display", "none");
                 $(".brand-icon").css("display", "inline-block");
@@ -56,6 +56,7 @@ $(document).ready(function () {
                 $(".brand-logo").css("display", "inline-block");
                 $("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
             }
+            $(this).blur();
         });
         /** sidebar mouseevents **/
         $("#navigation").hover(function () {
@@ -77,14 +78,14 @@ $(document).ready(function () {
             if (((win.height() <= 669) && $("#navigation").hasClass("col-sidebar-left"))) {
                 $("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
                 $("#navigation").toggleClass("col-sidebar-left");
-                $(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
+                $(".toggle-sidebar > i").toggleClass("fa-chevron-right fa-chevron-left");
                 $(".brand-icon").css("display", "none");
                 $(".brand-logo").css("display", "inline-block");
                 $("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
             } else if ((win.width() <= 768) && $("#navigation").hasClass("col-sidebar-left")) {
                 $("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
                 $("#navigation").toggleClass("col-sidebar-left");
-                $(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
+                $(".toggle-sidebar > i").toggleClass("fa-chevron-right fa-chevron-left");
                 $(".brand-logo").css("display", "none");
                 $(".brand-icon").css("display", "inline-block");
                 $("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index a94032861..ba1e1a8bf 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -62,7 +62,7 @@ if($need_alert_display == true) {
           <span class="icon-bar"></span>
         </button>
       </div>
-	  <button class="toggle-sidebar glyphicon glyphicon-chevron-left" style="display:none"></button>
+      <button class="toggle-sidebar" style="display:none"><i class="fa fa-chevron-left"></i></button>
       <div class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
           <li id="menu_messages"><?= get_menu_messages() ?></li>