diff --git a/templates/admin.html b/templates/admin.html
index cff90a0..3d0711b 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -38,7 +38,7 @@
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-              <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+              <i class="fa fa-user" aria-hidden="true"></i>
              <span class="caret"></span>
           </a>
           <ul class="dropdown-menu">
diff --git a/templates/test.html b/templates/test.html
index c51fbc2..d01dcad 100644
--- a/templates/test.html
+++ b/templates/test.html
@@ -55,17 +55,14 @@
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+                <i class="fa fa-user" aria-hidden="true"></i>
                 <span id="name">${t['student']['name']}</span>
                 (<span id="number">${t['student']['number']}</span>)
                 <span class="caret"></span>
           </a>
           <ul class="dropdown-menu">
             <li class="active"><a href="/test">Teste</a></li>
-            % if t['practice']:
-            <li><a href="/results">Ver resultados</a></li>
-            % endif
-            <li><a data-toggle="modal" data-target="#sair" id="form-button-submit"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> Sair</a></li>
+            <li><a data-toggle="modal" data-target="#sair" id="form-button-submit"><i class="fa fa-sign-out" aria-hidden="true"></i> Sair</a></li>
           </ul>
         </li>
       </ul>
@@ -96,7 +93,8 @@
                         <div class="panel panel-info drop-shadow">
                             <div class="panel-heading clearfix">
                                 <h4 class="panel-title pull-left">
-                                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> ${q['title']}
+                                    <i class="fa fa-info-circle" aria-hidden="true"></i>
+                                    ${q['title']}
                                 </h4>
                             </div>
                             <div class="panel-body">
@@ -106,7 +104,8 @@
                     % elif q['type'] == 'warning':
                         <div class="alert alert-warning drop-shadow" role="alert">
                             <h4>
-                                <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> ${q['title']}
+                                <i class="fa fa-question-circle" aria-hidden="true"></i>
+                                ${q['title']}
                             </h4>
                             <p>
                                 ${md_to_html(q['text'], q['ref'], q['files'])}
@@ -115,7 +114,8 @@
                     % elif q['type'] == 'alert':
                         <div class="alert alert-danger drop-shadow" role="alert">
                             <h4>
-                                <span class="glyphicon glyphicon-alert" aria-hidden="true"></span> ${q['title']}
+                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                ${q['title']}
                             </h4>
                             <p>
                                 ${md_to_html(q['text'], q['ref'], q['files'])}
--
libgit2 0.21.2