diff --git a/templates/default/selectidp-links.php b/templates/default/selectidp-links.php
index db9e9cde8adc3a456b0335338cba4eced61fa5b2..e57cdf6d03f5d9358993cb333959d6b1894b8142 100644
--- a/templates/default/selectidp-links.php
+++ b/templates/default/selectidp-links.php
@@ -15,7 +15,14 @@
 			$idpentry = $this->data['idplist'][$this->data['preferredidp']];
 			echo '<div class="preferredidp">';
 			echo '	<img src="/' . $this->data['baseurlpath'] .'resources/icons/star.png" style="float: right" />';
-			echo '	<h3>' . htmlspecialchars($idpentry['name']) . '</h3>';
+
+			echo '	<h3>';
+			if(array_key_exists('icon', $idpentry) && $idpentry['icon'] !== NULL) {
+				$iconUrl = SimpleSAML_Utilities::resolveURL($idpentry['icon']);
+				echo '<img style="display: inline" src="' . htmlspecialchars($iconUrl) . '" />';
+			}
+			echo htmlspecialchars($idpentry['name']) . '</h3>';
+
 			echo '	<p>' . htmlspecialchars($idpentry['description']) . '<br />';
 			echo '	[ <a href="' . $this->data['urlpattern'] . htmlspecialchars($idpentry['entityid']) . '">Select this IdP</a>]</p>';
 			echo '</div>';
@@ -24,7 +31,13 @@
 		
 		foreach ($this->data['idplist'] AS $idpentry) {
 			if ($idpentry['entityid'] != $this->data['preferredidp']) {
-				echo '<h3>' . htmlspecialchars($idpentry['name']) . '</h3>';
+				echo '	<h3>';
+				if(array_key_exists('icon', $idpentry) && $idpentry['icon'] !== NULL) {
+					$iconUrl = SimpleSAML_Utilities::resolveURL($idpentry['icon']);
+					echo '<img style="display: inline" src="' . htmlspecialchars($iconUrl) . '" />';
+				}
+				echo htmlspecialchars($idpentry['name']) . '</h3>';
+
 				echo '<p>' . htmlspecialchars($idpentry['description']) . '<br />';
 				echo '[ <a href="' . $this->data['urlpattern'] . htmlspecialchars($idpentry['entityid']) . '">Select this IdP</a>]</p>';
 			}