diff --git a/static/partials/header.html b/static/partials/header.html
index 2fa772a4f..6444833cf 100644
--- a/static/partials/header.html
+++ b/static/partials/header.html
@@ -28,7 +28,7 @@
     </form>
     
     <span class="navbar-left user-tools" ng-show="!user.anonymous">
-      <a href="/new/"><i class="fa fa-upload user-tool" title="Create new repository"></i></a>
+      <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
     </span>
 
     <li class="dropdown" ng-switch-when="false">
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 4ca9fa9a4..94d431155 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -45,9 +45,9 @@
             <span class="role-group" current-role="permission.role" role-changed="setRole(role, name, 'team')" roles="roles"></span>
           </td>
           <td>
-            <span class="delete-ui" tabindex="0" title="Delete Permission">
+            <span class="delete-ui" tabindex="0">
               <span class="delete-ui-button" ng-click="deleteRole(name, 'team')"><button class="btn btn-danger">Delete</button></span>
-              <i class="fa fa-remove"></i>
+              <i class="fa fa-remove" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
             </span>
           </td>
         </tr>
@@ -65,9 +65,9 @@
             </div>
           </td>
           <td>
-            <span class="delete-ui" tabindex="0" title="Delete Permission">
+            <span class="delete-ui" tabindex="0">
               <span class="delete-ui-button" ng-click="deleteRole(name, 'user')"><button class="btn btn-danger">Delete</button></span>
-              <i class="fa fa-times"></i>
+              <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
             </span>
           </td>
         </tr>
@@ -110,9 +110,9 @@
               </div>
             </td>
             <td>
-              <span class="delete-ui" tabindex="0" title="Delete Token">
+              <span class="delete-ui" tabindex="0">
                 <span class="delete-ui-button" ng-click="deleteToken(token.code)"><button class="btn btn-danger" type="button">Delete</button></span>
-                <i class="fa fa-remove"></i>
+                <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Token"></i>
               </span>
             </td>
           </tr>
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index 84eb76919..4c9c00fff 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -14,7 +14,7 @@
 
       <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
 
-      <span class="settings-cog" ng-show="repo.can_admin" title="Repository Settings">
+      <span class="settings-cog" ng-show="repo.can_admin" title="Repository Settings" bs-tooltip="tooltip.title" data-placement="bottom">
         <a href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/admin' }}">
           <i class="fa fa-cog fa-lg"></i>
         </a>
@@ -75,7 +75,7 @@
           <div class="panel panel-default">
             <div class="panel-heading">
               <!-- Tag dropdown -->
-              <div class="tag-dropdown dropdown" title="Tags">
+              <div class="tag-dropdown dropdown" title="Tags" bs-tooltip="tooltip.title" data-placement="top">
                 <i class="fa fa-tag"><span class="tag-count">{{getTagCount(repo)}}</span></i>
                 <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentTag.name}} <b class="caret"></b></a>
                 <ul class="dropdown-menu">
@@ -103,7 +103,7 @@
          <div class="panel panel-default">
            <div class="panel-heading">
              <!-- Image dropdown -->
-              <div class="tag-dropdown dropdown" title="Images">
+              <div class="tag-dropdown dropdown" title="Images" bs-tooltip="tooltip.title" data-placement="top">
                 <i class="fa fa-archive"><span class="tag-count">{{imageHistory.length}}</span></i>
                 <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentImage.id.substr(0, 12)}} <b class="caret"></b></a>
                 <ul class="dropdown-menu">
@@ -138,15 +138,15 @@
                 <div class="changes-container small-changes-container"
                             ng-show="currentImageChanges.changed.length || currentImageChanges.added.length || currentImageChanges.removed.length">
                   <div class="changes-count-container accordion-toggle" data-toggle="collapse" data-parent="#accordion" data-target="#collapseChanges">
-                    <span class="change-count added" ng-show="currentImageChanges.added.length > 0" title="Files Added">
+                    <span class="change-count added" ng-show="currentImageChanges.added.length > 0" title="Files Added" bs-tooltip="tooltip.title" data-placement="bottom">
                       <i class="fa fa-plus-square"></i>
                       <b>{{currentImageChanges.added.length}}</b>
                     </span>
-                    <span class="change-count removed" ng-show="currentImageChanges.removed.length > 0" title="Files Removed">
+                    <span class="change-count removed" ng-show="currentImageChanges.removed.length > 0" title="Files Removed" bs-tooltip="tooltip.title" data-placement="bottom">
                       <i class="fa fa-minus-square"></i>
                       <b>{{currentImageChanges.removed.length}}</b>
                     </span>
-                    <span class="change-count changed" ng-show="currentImageChanges.changed.length > 0" title="Files Changed">
+                    <span class="change-count changed" ng-show="currentImageChanges.changed.length > 0" title="Files Changed" bs-tooltip="tooltip.title" data-placement="bottom">
                       <i class="fa fa-pencil-square"></i>
                       <b>{{currentImageChanges.changed.length}}</b>
                     </span>