diff --git a/caravel/templates/appbuilder/navbar.html b/caravel/templates/appbuilder/navbar.html
index 9e5a872b75..353cb017be 100644
--- a/caravel/templates/appbuilder/navbar.html
+++ b/caravel/templates/appbuilder/navbar.html
@@ -21,7 +21,12 @@
         {% include 'appbuilder/navbar_menu.html' %}
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="http://airbnb.io/caravel"><i class="fa fa-book"></i> {{_("Documentation") }}</a></li>
+        <li><a href="https://github.com/airbnb/caravel" title="Caravel's Github">
+          <i class="fa fa-github fa-lg"></i></a>
+        </li>
+        <li><a href="http://airbnb.io/caravel" title="Documentation">
+          <i class="fa fa-book fa-lg"></i> </a>
+        </li>
         {% include 'appbuilder/navbar_right.html' %}
       </ul>
     </div>
diff --git a/caravel/templates/appbuilder/navbar_right.html b/caravel/templates/appbuilder/navbar_right.html
index 5b1ecd560d..7a07f25cb8 100644
--- a/caravel/templates/appbuilder/navbar_right.html
+++ b/caravel/templates/appbuilder/navbar_right.html
@@ -10,16 +10,18 @@
        </div>
     </a>
     <ul class="dropdown-menu">
-    <li class="dropdown">
+      <li class="dropdown">
         {% for lang in languages %}
             {% if lang != locale %}
                 <a tabindex="-1" href="{{appbuilder.get_url_for_locale(lang)}}">
-                  <div class="f16"><i class="flag {{languages[lang].get('flag')}}"></i> - {{languages[lang].get('name')}}
-                </div></a>
-                {% endif %}
-            {% endfor %}
-        </li>
-        </ul>
+                  <div class="f16">
+                    <i class="flag {{languages[lang].get('flag')}}"></i> - {{languages[lang].get('name')}}
+                  </div>
+                </a>
+            {% endif %}
+        {% endfor %}
+      </li>
+    </ul>
 </li>
 {% endif %}
 
@@ -27,9 +29,9 @@
 
 {% if not current_user.is_anonymous() %}
     <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-           <span class="fa fa-user"></span> {{g.user.get_full_name()}}<b class="caret"></b>
-        </a>
+      <a class="dropdown-toggle" data-toggle="dropdown" title="{{g.user.get_full_name()}}" href="#">
+        <span class="fa fa-user fa-lg" title=""></span><b class="caret"></b>
+      </a>
         <ul class="dropdown-menu">
             <li><a href="{{appbuilder.get_url_for_userinfo}}"><span class="fa fa-fw fa-user"></span>{{_("Profile")}}</a></li>
             <li><a href="{{appbuilder.get_url_for_logout}}"><span class="fa fa-fw fa-sign-out"></span>{{_("Logout")}}</a></li>