diff --git a/django/website/templates/base_side.html b/django/website/templates/base_side.html
index 9dfe6f0a7f6337ebc02482e4f7f68f718d2fb7b7..380863381dbe558bcdef8e719a6b2fc1b2c7e109 100644
--- a/django/website/templates/base_side.html
+++ b/django/website/templates/base_side.html
@@ -8,9 +8,9 @@
             </div>
     	<nav class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
-            	<li><a class="active" href="{% url "dashboard" %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-            	<li><a href="{% url "sources" %}"><i class="fa fa-download fa-fw"></i> Sources</a></li>
-                <li><a href="{% url "data-view" %}"><i class="fa fa-pencil fa-fw"></i> View &amp; Edit</a></li>
+                <li><a class="active" href="{% url "dashboard" %}"><span class="fa fa-dashboard fa-fw"></span> Dashboard</a></li>
+                <li><a href="{% url "sources" %}"><span class="fa fa-download fa-fw"></span> Sources</a></li>
+                <li><a href="{% url "data-view" %}"><span class="fa fa-pencil fa-fw"></span> View &amp; Edit</a></li>
             </ul>
         </nav>
         <div class="site-info">
@@ -32,11 +32,11 @@
         <ul class="nav navbar-top-links navbar-right">
             <li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <i class="fa fa-user fa-fw"></i>  {{ request.user }}  <i class="fa fa-caret-down"> </i>
+                    <span class="fa fa-user fa-fw"></span>  {{ request.user }}  <span class="fa fa-caret-down"> </span>
                 </a>
                 <ul class="dropdown-menu dropdown-user">
-                    <li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a></li>
-                    <li><a href="{% url "logout" %}?next={% url 'login' %}" class=""><i class="fa fa-sign-out fa-fw"></i>{% trans "Log out" %}</a></li>
+                    <li><a href="#"><span class="fa fa-gear fa-fw"></span> Settings</a></li>
+                    <li><a href="{% url "logout" %}?next={% url 'login' %}" class=""><span class="fa fa-sign-out fa-fw"></span>{% trans "Log out" %}</a></li>
                 </ul>
                 <!-- /.dropdown-user -->
             </li>