diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 51cb65c56f1f75f28fb923c79c7366afa22286d5..21af134c912aeb85acbedaf88e3ab8ef3977a61b 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -28,7 +28,7 @@ class setupStep extends simplePlugin
   var $is_enabled   = FALSE;
   var $is_completed = FALSE;
 
-  var $header_image = "images/setup/user.png";
+  var $header_image = "";
 
   static function getAttributesInfo()
   {
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index b1a2f7493264c461c70200199ac6b0b8115b004f..b850af6b2b3dddd0c8537e1b9ed9a5b2014afe91 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -21,7 +21,7 @@
 
 class Step_Checks extends setupStep
 {
-  var $header_image   = 'geticon.php?context=categories&icon=checks&size=48';
+  var $header_image = 'geticon.php?context=categories&icon=checks&size=48';
 
   static function getAttributesInfo()
   {
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index b727b2a4eb11f72c41dde18b91273a623df0d3fa..1a52e0806d755df6245e4a0ed814c1ed7bf2e418 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -21,14 +21,13 @@
 
 class Step_Finish extends setup_step
 {
-  var $header_image     = 'geticon.php?context=devices&icon=server&size=48';
+  var $header_image = 'geticon.php?context=devices&icon=server&size=48';
 
   function __construct()
   {
     $this->update_strings();
   }
 
-
   function update_strings()
   {
     $this->s_title      = _("Finish");
@@ -36,7 +35,6 @@ class Step_Finish extends setup_step
     $this->s_title_long = _("Finish - write the configuration file");
   }
 
-
   function get_conf_data()
   {
     $smarty = get_smarty();
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index e2852c55367b86935b0bda6a65c7736db36d5e3c..54293b2b56542a49dff653b8f1ed132b6fa0ccbc 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -21,7 +21,7 @@
 
 class Step_Language extends setupStep
 {
-  var $header_image   = 'geticon.php?context=applications&icon=config-language&size=48';
+  var $header_image = 'geticon.php?context=applications&icon=config-language&size=48';
 
   static function getAttributesInfo()
   {
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index e6e81b691531c8908abfff346db917904fafb7d2..fef8071d0986ade30b988ef4d9016fac1b70beb0 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -46,9 +46,9 @@ array_to_ldif               - Create ldif output of an ldap result array
 
 class Step_Migrate extends setup_step
 {
+  var $header_image   = "geticon.php?context=applications&icon=utilities-system-monitor&size=48";
   var $languages      = array();
   var $attributes     = array('valid_admin');
-  var $header_image   = 'geticon.php?context=applications&icon=utilities-system-monitor&size=48';
   var $checks         = array();
 
   /* Department migration attributes */
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 6cd4c6a314765d393d9d8ae20696fb93c932cf1e..2479df2fd4ea4f90dd2ceb20ca07e9150e4d7a31 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -33,11 +33,11 @@
           <!-- Information popup -->
           <div class='solution_visible' id='sol_{$key}'>
             {if $val.MUST}
-              <div class='step2_failed_text' style="background-image: url('images/small_error.png')">
+              <div class='step2_failed_text' style="background-image: url('geticon.php?context=status&icon=dialog-error&size=16')">
               {$val.SOLUTION}<br/>
               <b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
             {else}
-              <div class="step2_warning_text" style="background-image: url('images/small_warning.png')">
+              <div class="step2_warning_text" style="background-image: url('geticon.php?context=status&icon=dialog-warning&size=16')">
               {$val.SOLUTION}<br/>
               <b>{t}FusionDirectory will run without fixing this.{/t}</b>
             {/if}