diff --git a/modules/InfoCard/templates/temp-getcardform.php b/modules/InfoCard/templates/temp-getcardform.php
index bf8f728ec95b2e049a1b5cbb6211aeae427987f6..8525c3ea0144ae34d4fd826bf6828da7024ee144 100644
--- a/modules/InfoCard/templates/temp-getcardform.php
+++ b/modules/InfoCard/templates/temp-getcardform.php
@@ -6,7 +6,6 @@
* DESCRIPTION: InfoCard module template.
*/
$this->includeAtTemplateBase('includes/header.php');
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
diff --git a/modules/InfoCard/templates/temp-login.php b/modules/InfoCard/templates/temp-login.php
index 70cd74f746a26091b52540342f8f4115c6c3c47e..25f0d93b5e98427d62dfdabe7b7d282f471a667a 100644
--- a/modules/InfoCard/templates/temp-login.php
+++ b/modules/InfoCard/templates/temp-login.php
@@ -6,7 +6,6 @@
* DESCRIPTION: InfoCard module template.
*/
$this->includeAtTemplateBase('includes/header.php');
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index c9e8d7a07a5a8a52e56caa36c55e62990d359f74..029f5aac61c49b340f37d455ebd4ff2baa6b1ad8 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{authYubiKey:yubikey:header}');
$this->data['autofocus'] = 'otp';
diff --git a/modules/consent/templates/noconsent.php b/modules/consent/templates/noconsent.php
index d115b0db2f94ded506559220835a861b05c9991e..f96b44542cf1ecb96b186c6c5775a5fefa3b1e0d 100644
--- a/modules/consent/templates/noconsent.php
+++ b/modules/consent/templates/noconsent.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('{consent:consent:noconsent_title}');;
- $this->data['icon'] = 'bomb_l.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 771c4134f7fd7acecf04aec385f78d32088bf031..97fef2fd79f473c7ae38aa899811195dd9d88216 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{login:user_pass_header}');
if (strlen($this->data['username']) > 0) {
diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index 2cc6b84f6ec6c7210ebbab6632e75ecdce248afb..bbf00eedf06476438a2c7c95d44a05e177a87d3c 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -52,6 +52,5 @@ $t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?logout';
-$t->data['icon'] = 'bino.png';
$t->show();
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index fa1bc296b1f2b30bb5ca80be583ee94fccf4849c..506bf2e9a04fe0c16f8a6ad2200d62a27763b00b 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -60,7 +60,6 @@ $t->data['pageid'] = 'frontpage_auth';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index cdcec795b2b3f73dc3b99963146e24d8159a51cc..856144e756747ebfdd1c14cb0839b13f44a1cde8 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -134,7 +134,6 @@ $t->data['pageid'] = 'frontpage_config';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['warnings'] = $warnings;
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 893acbd57fdb9d9862d17e39c4fdc12f19cb98dc..51d779cfaf496563641bd75bea29d8e00c2b07bf 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -140,7 +140,6 @@ $t->data['pageid'] = 'frontpage_federation';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 169f22e4bb965a62b51733ab6e62755a8f400d00..bd905f882701c9793cf735fb32fbc4d7cde46ebf 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -52,7 +52,6 @@ $t->data['pageid'] = 'frontpage_welcome';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
$t->data['links_welcome'] = $links_welcome;
diff --git a/modules/multiauth/templates/selectsource.php b/modules/multiauth/templates/selectsource.php
index 6cf7fa03105d8a013f87f53ecf5e24c0a7455ffc..5d5290cd1c40af9fb16d35a22da6fadaccfaaf4f 100644
--- a/modules/multiauth/templates/selectsource.php
+++ b/modules/multiauth/templates/selectsource.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{multiauth:multiauth:select_source_header}');
$this->includeAtTemplateBase('includes/header.php');
diff --git a/modules/oauth/www/authorize.php b/modules/oauth/www/authorize.php
index 49a5e2e3552059db8b3a35a7012a13c5128fe76f..e0a9bb0f226928885f8e3d0a8e4c41ccd3577525 100644
--- a/modules/oauth/www/authorize.php
+++ b/modules/oauth/www/authorize.php
@@ -49,7 +49,6 @@ if (isset($_REQUEST['oauth_callback'])) {
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?logout';
- $t->data['icon'] = 'bino.png';
$t->show();
}
diff --git a/modules/openid/templates/consumer.php b/modules/openid/templates/consumer.php
index 8471693c6f215679a95f0ec9b488f472dc09bbc5..8a709ce06c8092beef4e74a3e2bccdc3f108eccf 100644
--- a/modules/openid/templates/consumer.php
+++ b/modules/openid/templates/consumer.php
@@ -1,7 +1,6 @@
<?php
$this->data['header'] = 'OpenID Login';
-$this->data['icon'] = 'openid.png';
$this->data['autofocus'] = 'openid-identifier';
$this->includeAtTemplateBase('includes/header.php');
diff --git a/modules/openid/www/openidtest.php b/modules/openid/www/openidtest.php
index 4f6d946acc47d35f14c5808ce92bfbf6738511c1..c02d02b6210d0fb00f5138d618f57302e0cb3ce2 100644
--- a/modules/openid/www/openidtest.php
+++ b/modules/openid/www/openidtest.php
@@ -24,7 +24,6 @@ $t->data['header'] = '{openid:dictopenid:openidtestpage}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = NULL;
$t->show();
diff --git a/templates/admin-metadatalist.php b/templates/admin-metadatalist.php
index ad3f9738b2eee3efe2a63e02db7193a2ec5d3429..1dd67fb8958d60f18213ff72157840470c45bc8b 100644
--- a/templates/admin-metadatalist.php
+++ b/templates/admin-metadatalist.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('metaover_header');
-$this->data['icon'] = 'bino.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/error.php b/templates/error.php
index 3c36f67fbfceab52c7e659e13e93879313661874..8c8b9cea502f2b90a842d355c2eb69e44c3b670b 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('error_header');
- $this->data['icon'] = 'bomb_l.png';
$this->data['head'] = '
<meta name="robots" content="noindex, nofollow" />
diff --git a/templates/errorreport.php b/templates/errorreport.php
index 417ba92f8a67bf294a05f83865c3be96f934470e..c6d22cc7f44df8e4d4f15f1eacc6e8e44293c951 100644
--- a/templates/errorreport.php
+++ b/templates/errorreport.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('errorreport_header');
- $this->data['icon'] = 'bomb_l.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/httpredirect-debug.php b/templates/httpredirect-debug.php
index b65338b24701d498912b8bd6190d9b72c94d58fd..065857f48c0ab225752bb6442257725b0bc03b5d 100644
--- a/templates/httpredirect-debug.php
+++ b/templates/httpredirect-debug.php
@@ -1,5 +1,4 @@
<?php
- $this->data['icon'] = 'debug.png';
$this->data['autofocus'] = 'sendlink';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/login-ldapmulti.php b/templates/login-ldapmulti.php
index 1273a4ed1f0b44e747f39b1da0c4ab6ad57bd716..528e2f023cf3396127bd5bfbc42dacf5a46b3669 100644
--- a/templates/login-ldapmulti.php
+++ b/templates/login-ldapmulti.php
@@ -1,5 +1,4 @@
<?php
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/login.php b/templates/login.php
index e317aa5accccf874da01690bbabae8de569241a5..5af13151b0773f854c6db6e3beef4e8a23ccd356 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -1,5 +1,4 @@
<?php
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (!isset($this->data['autofocus'])) {
$this->data['autofocus'] = 'username';
}
diff --git a/templates/post-debug.php b/templates/post-debug.php
index a1d4a9c218e7d63fbac42f84314e0346c8676578..fabf353b3e00d8f245ad4c59d5978f1c75c16fd9 100644
--- a/templates/post-debug.php
+++ b/templates/post-debug.php
@@ -1,5 +1,4 @@
<?php
- $this->data['icon'] = 'debug.png';
$this->data['autofocus'] = 'sendbutton';
$this->includeAtTemplateBase('includes/header.php');
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index d37d8f38d986c9f8f31a4a389d8210589603edd9..7dd041364a2648f2691906428e55b42bc5eff63c 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -72,7 +72,6 @@ $t->data['header'] = '{status:header_saml20_sp}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = '/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' .
$config->getBaseURL() . 'logout.php';
$t->show();
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index 39e650e1b5752108f2c733d93d5a043a1b9e718c..94f1b7ae43bb8c6e344040d7cbd81b162cd08830 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -74,7 +74,6 @@ $t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['attributes'] = $session->getAttributes();
$t->data['logout'] = null;
-$et->data['icon'] = 'bino.png';
$t->show();
diff --git a/www/example-simple/wsfed-example.php b/www/example-simple/wsfed-example.php
index 3136f61afa0cff069443066729d5f563fc194ca9..a7c5610c27c6462fdcdb279ae61be8c20ae982a6 100644
--- a/www/example-simple/wsfed-example.php
+++ b/www/example-simple/wsfed-example.php
@@ -20,7 +20,6 @@ $t->data['header'] = '{status:header_wsfed}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = '/' . $config->getBaseURL() . 'wsfed/sp/initSLO.php?RelayState=/' . $config->getBaseURL() . 'logout.php';
$t->show();