diff --git a/resources/base.scss b/resources/base.scss
index e7a3b3e..1559ffe 100644
--- a/resources/base.scss
+++ b/resources/base.scss
@@ -966,20 +966,18 @@ input::placeholder{
     text-align: center;
 }
 
-#fa-icon-links:hover,
-#fa-icon-links:active,
-#fa-icon-links:hover #fa-icon,
-#fa-icon-links:active #fa-icon {
-    color: $theme_color;
+.nav-fa-icon {
+    i {
+        margin-right: 0.1em;
+        color: #000;
+        font-size: 22.5px;
+    }
 }
 
-#fa-icon {
-    margin-right: 0.1em;
-    color: #000;
-    font-size:22.5px;
-}
-#fa-icon-active {
-    margin-right: 0.1em;
-    color: $theme_color;
-    font-size:22.5px;
+.nav-fa-icon-active {
+    i {
+        color: $theme_color;
+        font-size: 22.5px;
+        margin-right: 0.1em;
+    }
 }
\ No newline at end of file
diff --git a/resources/icons/logo.png b/resources/icons/logo.png
new file mode 100644
index 0000000..1786dfd
Binary files /dev/null and b/resources/icons/logo.png differ
diff --git a/templates/base.html b/templates/base.html
index a281b47..4d1e0f9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -217,58 +217,24 @@
           <li class="home-nav-element"><span class="nav-divider"></span></li>
           <li class="home-menu-item"><a href="{{ url('home') }}" class="nav-home">{{ _('Home') }}</a></li>
           {% for node in mptt_tree(nav_bar) recursive %}
-            {% if node.key != "chat" %}
-              <li>
-                <a href="{{ node.path }}" id="fa-icon-links" class="normal-text nav-{{ node.key }}{% if node.key in nav_tab %} active{% endif %}" style="font-size: smaller; margin-right: 1.5em; text-align: left;">
-                  {% if node.key == "problems" %}
-                    {% if node.key not in nav_tab %}
-                      <i id="fa-icon" class="fa fa-pencil"></i>
-                    {% else %}
-                      <i id="fa-icon-active" class="fa fa-pencil"></i>
-                    {% endif %}
-                  {% endif %}
-
-                  {% if node.key == "submit" %}
-                    {% if node.key not in nav_tab %}
-                      <i id="fa-icon" class="fa fa-neuter"></i>
-                    {% else %}
-                      <i id="fa-icon-active" class="fa fa-neuter"></i>
-                    {% endif %}
-                  {% endif %}
-
-                  {% if node.key == "user" %}
-                    {% if node.key not in nav_tab %}
-                      <i id="fa-icon" class="fa fa-user"></i>
-                    {% else %}
-                      <i id="fa-icon-active" class="fa fa-user"></i>
-                    {% endif %}
-                  {% endif %}
-
-                  {% if node.key == "contest" %}
-                    {% if node.key not in nav_tab %}
-                      <i id="fa-icon" class="fa fa-graduation-cap"></i>
-                    {% else %}
-                      <i id="fa-icon-active" class="fa fa-graduation-cap"></i>
-                    {% endif %}
-                  {% endif %}
-                  {% if node.key == "about" %}
-                    {% if node.key not in nav_tab %}
-                      <i id="fa-icon" class="fa fa-group"></i>
-                    {% else %}
-                      <i id="fa-icon-active" class="fa fa-group"></i>
-                    {% endif %}
-                  {% endif %}
-
-                  {{ user_trans(node.label) }}
-                  {% if not node.is_leaf_node %}
-                    <div href="javascript:void(0)" class="nav-expand">></div>
-                  {% endif %}
-                </a>
-                {% with children=node.get_children() %}
-                  {% if children %}<ul>{{ loop(children) }}</ul>{% endif %}
-                {% endwith %}
-              </li>
-            {% endif %}
+            <li>
+              <a href="{{ node.path }}" id="fa-icon-links" class="normal-text nav-{{ node.key }}{% if node.key in nav_tab %} active{% endif %}" style="font-size: smaller; margin-right: 1.5em; text-align: left;">
+                <span class="nav-fa-icon{{'-active' if node.key in nav_tab else''}}">
+                  {% if node.key == "problems" %} <i class="fa fa-pencil"></i> {% endif %}
+                  {% if node.key == "submit" %} <i class="fa fa-neuter"></i> {% endif %}
+                  {% if node.key == "user" %} <i class="fa fa-user"></i> {% endif %}
+                  {% if node.key == "contest" %} <i class="fa fa-graduation-cap"></i> {% endif %}
+                  {% if node.key == "about" %} <i class="fa fa-group"></i> {% endif %}
+                </span>
+                {{ user_trans(node.label) }}
+                {% if not node.is_leaf_node %}
+                  <div href="javascript:void(0)" class="nav-expand">></div>
+                {% endif %}
+              </a>
+              {% with children=node.get_children() %}
+                {% if children %}<ul>{{ loop(children) }}</ul>{% endif %}
+              {% endwith %}
+            </li>
           {% endfor %}
         </ul>