diff --git a/static/css/quay.css b/static/css/quay.css
index fbc8008d2..68acdd592 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -1,4 +1,4 @@
-.editable .glyphicon {
+.editable i {
   opacity: 0.2;
   font-size: 85%;
   margin-left: 10px;
@@ -7,7 +7,7 @@
   transition: opacity 500ms ease-in-out;
 }
 
-.noteditable .glyphicon {
+.noteditable i {
     display: none;
 }
 
@@ -21,7 +21,7 @@ p.editable:hover {
   cursor: pointer;
 }
 
-p.editable:hover .glyphicon {
+p.editable:hover i {
   opacity: 1;
 }
 
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index 4af8990bd..7bdeef571 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -6,7 +6,7 @@
   <!-- Repo Header -->
   <div class="header">
     <h3>
-      <span class="glyphicon glyphicon-hdd"></span> <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
+      <i class="icon-hdd icon-large"></i> <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
     </h3>   
 
     <!-- Pull command -->
@@ -16,14 +16,14 @@
   </div>
 
   <!-- Description -->
-  <p ng-class="'description lead ' + (repo.can_write ? 'editable' : 'noteditable')" ng-click="editDescription()"><span class="content">{{repo.description}}</span><span class="glyphicon glyphicon-pencil"></span></p>
+  <p ng-class="'description lead ' + (repo.can_write ? 'editable' : 'noteditable')" ng-click="editDescription()"><span class="content">{{repo.description}}</span><i class="icon-edit"></i></p>
 
 
   <!-- Tab bar -->
   <ul class="nav nav-tabs">
   <li>
     <span class="tag-dropdown dropdown">
-      <span class="glyphicon glyphicon-bookmark"></span>
+      <i class="icon-bookmark"></i>
       <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentTag.name}} <b class="caret"></b></a>
       <ul class="dropdown-menu">
 	<li ng-repeat="tag in repo.tags">
diff --git a/templates/index.html b/templates/index.html
index 75bd29aff..adf3a0369 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css">
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
 
     <link rel="stylesheet" href="/static/css/quay.css">