diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp
index 225850197..cd62f8f34 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp
@@ -118,15 +118,15 @@
                         <legend style="margin-bottom: 0;">Remember this decision:</legend>
                     	<label for="remember-forever" class="radio">
                     		<input type="radio" name="remember" id="remember-forever" value="until-revoked" checked="checked">
-                    		<i class="icon-hdd"></i> remember this decision until I revoke it
+                    		remember this decision until I revoke it
                     	</label>
                     	<label for="remember-hour" class="radio">
                     		<input type="radio" name="remember" id="remember-hour" value="one-hour">
-                    		<i class="icon-hdd"></i> remember this decision for one hour
+                    		remember this decision for one hour
                     	</label>
                     	<label for="remember-not" class="radio">
                     		<input type="radio" name="remember" id="remember-not" value="none">
-                    		<i class="icon-hdd"></i> prompt me again next time
+                    		prompt me again next time
                     	</label>
                       </fieldset>
 				</div>
diff --git a/openid-connect-server/src/main/webapp/resources/template/admin.html b/openid-connect-server/src/main/webapp/resources/template/admin.html
index e80c6542c..782beb537 100644
--- a/openid-connect-server/src/main/webapp/resources/template/admin.html
+++ b/openid-connect-server/src/main/webapp/resources/template/admin.html
@@ -3,7 +3,7 @@
 <script type="text/html" id="tmpl-client">
 	<td>
 		<% if (dynamicallyRegistered) { %>
-		<span class="dynamically-registered"><i class="icon-cog"></i></span>
+		<span class="dynamically-registered"><i class="icon-globe"></i></span>
 		<% } %>
 	</td>
 
@@ -271,7 +271,7 @@
 
 <script type="text/html" id="tmpl-list-widget-child">
     <td><%=(item.length > 30) ? item.substr(0,27) + '...' : item %></td>
-    <td><a class="btn btn-small btn-delete" href="#"><i class="icon-minus-sign icon-gray"></i></a></td>
+    <td><a class="btn btn-small btn-delete" href="#"><i class="icon-minus-sign"></i></a></td>
 </script>
 
 <script type="text/html" id="tmpl-list-widget">
@@ -279,7 +279,7 @@
     <tr>
         <th class="control-group">
             <input type="text" value="" placeholder="<%=(placeholder) ? placeholder : ''%>"></th>
-        <th><a class="btn btn-small btn-add" href="#"><i class="icon-plus-sign icon-gray"></i></a></th>
+        <th><a class="btn btn-small btn-add" href="#"><i class="icon-plus-sign"></i></a></th>
     </tr>
     </thead>
 	<tbody>
@@ -291,7 +291,7 @@
 <script type="text/html" id="tmpl-whitelist">
 	<td>
 		<% if (client.dynamicallyRegistered) { %>
-		<span class="dynamically-registered"><i class="icon-cog"></i></span>
+		<span class="dynamically-registered"><i class="icon-globe"></i></span>
 		<% } %>
 	</td>
 
@@ -403,10 +403,10 @@
 <script type="text/html" id="tmpl-grant">
 	<td>
 		<% if (client.dynamicallyRegistered) { %>
-		<span class="dynamically-registered"><i class="icon-cog"></i></span>
+		<span class="dynamically-registered"><i class="icon-globe"></i></span>
 		<% } %>
-		<% if (grant.whitelistedSite != null) { //TODO: change to icon-certificate %>
-		<span class="whitelisted-site"><i class="icon-ok-sign"></i></span>
+		<% if (grant.whitelistedSite != null) { %>
+		<span class="whitelisted-site"><i class="icon-thumbs-up"></i></span>
 		<% } %>
 	</td>