diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index 5223f6e69..a7cb7ab90 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -1,8 +1,17 @@
 <div class="navbar navbar-org navbar-static-top">
   <div class="container">
     <ul class="nav navbar-nav navbar-right">
-      <li><a href="http://fonticons.com/?ref=font-awesome-org-navbar"><i class="fas fas-star-logo"></i>&nbsp; Fonticons</a></li>
-      <li class="active"><a href="http://fontawesome.io/?ref=font-awesome-org-navbar"><i class="fas fas-flag-logo"></i>&nbsp; Font Awesome</a></li>
+      <li>
+        <a href="http://fortawesome.com/?utm_source=font_awesome_navbar&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_5.0_update" data-toggle="tooltip" data-container="body" data-placement="bottom" data-html="true" title="Take your front-end game<br>to the next level!">
+          <i class="fas fas-fort-logo fas-lg valign-baseline"></i>&nbsp;
+          Fort Awesome
+        </a>
+      </li>
+      <li class="active">
+        <a href="http://fontawesome.io/?utm_source=font_awesome_navbar&utm_medium=display&utm_content=font_awesome_navbar&utm_campaign=promo_5.0_update" data-toggle="tooltip" data-container="body" data-placement="bottom" data-html="true" title="The iconic font<br>&amp; CSS toolkit">
+          <i class="fas fas-flag-logo"></i>&nbsp;
+          Font Awesome</a>
+      </li>
     </ul>
     <div class="navbar-text navbar-right hide-xs">Build and serve a faster front end!</div>
   </div>
diff --git a/src/assets/js/site.js b/src/assets/js/site.js
index 1d62c1682..83fdc1112 100644
--- a/src/assets/js/site.js
+++ b/src/assets/js/site.js
@@ -61,6 +61,7 @@ $(function () {
     interval: 5000
   });
 
+  $('[data-toggle="tooltip"]').tooltip();
   $('[data-toggle="popover"]').popover();
 
   function selectFonticonsAd() {
diff --git a/src/assets/less/site.less b/src/assets/less/site.less
index f31be8dbb..ad54df3e1 100644
--- a/src/assets/less/site.less
+++ b/src/assets/less/site.less
@@ -9,6 +9,7 @@
 @import "site/bootstrap/wells";
 @import "site/bootstrap/type";
 @import "site/bootstrap/alerts";
+@import "site/bootstrap/tooltip";
 @import "site/bootstrap/modals";
 
 @import "site/layout";
diff --git a/src/assets/less/site/bootstrap/tooltip.less b/src/assets/less/site/bootstrap/tooltip.less
new file mode 100644
index 000000000..5a7087141
--- /dev/null
+++ b/src/assets/less/site/bootstrap/tooltip.less
@@ -0,0 +1,8 @@
+.tooltip {
+  font-size: @font-size-base;
+}
+
+// Wrapper for the tooltip content
+.tooltip-inner {
+  padding: 5px 10px;
+}
diff --git a/src/assets/less/site/lazy.less b/src/assets/less/site/lazy.less
index 8f9e45ced..39bde5423 100644
--- a/src/assets/less/site/lazy.less
+++ b/src/assets/less/site/lazy.less
@@ -108,3 +108,5 @@
 #no-search-results {
   display: none;
 }
+
+.valign-baseline { vertical-align: baseline !important; }
\ No newline at end of file