diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index 4382daf73..73d1f18e7 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -41,7 +41,9 @@
 			<% if (client.allowIntrospection) { %>
 				<span class="label label-inverse allow-introspection"><i class="icon-eye-open icon-white"></i></span>
 			<% } %>
-			<small class="muted" title="<%= hoverCreationDate %>">Registered <%= displayCreationDate %></small>
+		</div>
+		<div>
+			<small class="muted" title="<%= hoverCreationDate %>"><i class="icon-time"></i> Registered <%= displayCreationDate %></small>
 		</div>
 		<div class="matched text-info">
 			<small><i>Matched: <span class="label"></span></i></small>
@@ -125,7 +127,7 @@
 			<th></th>
             <th>Client</th>
             <th>Information</th>
-            <th></th>
+            <th><i class="icon-edit"></i></th>
         </tr>
         </thead>
         <tbody>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html b/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
index c58cc1828..e0de45199 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/grant.html
@@ -45,8 +45,8 @@
         <tr>
 			<th></th>
             <th>Application</th>
-			<th></th>
-            <th></th>
+			<th><i class="icon-time"></i></th>
+            <th><i class="icon-edit"></i></th>
         </tr>
         </thead>
         <tbody>
@@ -69,8 +69,8 @@
         <tr>
 			<th></th>
             <th>Application</th>
-			<th></th>
-            <th></th>
+			<th><i class="icon-time"></i></th>
+            <th><i class="icon-edit"></i></th>
         </tr>
         </thead>
         <tbody>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html b/openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html
index 63995bbea..cdeda19c1 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/whitelist.html
@@ -56,7 +56,7 @@
 			<th></th>
             <th>Client</th>
             <th>Scopes</th>
-            <th></th>
+            <th><i class="icon-edit"></i></th>
         </tr>
         </thead>
         <tbody>