diff --git a/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css b/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
index 0a67c56a4..9049d5a81 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
+++ b/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
@@ -186,3 +186,9 @@ h1,label {
 .user-profile dd, .user-profile dt {
     height: 20px;
 }
+
+/* Client table images */
+.client-logo {
+	max-width: 64px; 
+	max-height: 64px
+}
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 6a61f38c4..5b71f0f6e 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
@@ -28,20 +28,29 @@
 	</td>
 
     <td>
-		<div>
-	        <span class="clientid-substring" title="<%- client.clientId %> (click to display client ID)"><%- client.clientName != null ? client.clientName : ( client.clientId.substr(0,8) + '...' ) %></span>
-		</div>
-		<div>
-			<input type="text" readonly style="cursor: text" class="clientid-full input-xxlarge" value="<%- client.clientId %>" />
-		</div>
-		<div>
-			<% if (client.dynamicallyRegistered) { %>
-				<span class="label label-inverse dynamically-registered"><i class="icon-globe icon-white"></i></span>
-			<% } %>
-			<% if (client.allowIntrospection) { %>
-				<span class="label allow-introspection"><i class="icon-eye-open icon-white"></i></span>
+
+		<div class="media">
+			<% if (client.logoUri) { %>
+				<span class="pull-left"><img class="media-object client-logo" src="<%- client.logoUri %>"></span>
 			<% } %>
+
+			<div class="media-body">
+		        <span class="clientid-substring" title="<%- client.clientId %> (click to display client ID)"><%- client.clientName != null ? client.clientName : ( client.clientId.substr(0,8) + '...' ) %></span>
+			</div>
+			<div>
+				<input type="text" readonly style="cursor: text" class="clientid-full input-xxlarge" value="<%- client.clientId %>" />
+			</div>
+			<div>
+				<% if (client.dynamicallyRegistered) { %>
+					<span class="label label-inverse dynamically-registered"><i class="icon-globe icon-white"></i></span>
+				<% } %>
+				<% if (client.allowIntrospection) { %>
+					<span class="label allow-introspection"><i class="icon-eye-open icon-white"></i></span>
+				<% } %>
+			</div>
 		</div>
+
+
 		<div>
 			<small class="muted" title="<%- hoverCreationDate %>"><i class="icon-time"></i> <span data-i18n="client.client-table.registered">Registered</span> <%- displayCreationDate %></small>
 		</div>