diff --git a/html/images/setup/fai.png b/html/images/setup/fai.png
deleted file mode 100644
index 3bd55d28e3825143cb7c1dd70ee15dcafcb483d1..0000000000000000000000000000000000000000
Binary files a/html/images/setup/fai.png and /dev/null differ
diff --git a/html/images/setup/ldap.png b/html/images/setup/ldap.png
deleted file mode 100644
index 63800057f692e93182b5f8a822c81ae31467e48e..0000000000000000000000000000000000000000
Binary files a/html/images/setup/ldap.png and /dev/null differ
diff --git a/html/images/setup/license.png b/html/images/setup/license.png
deleted file mode 100644
index d7bcd7877d0dba816140103fd4826e6f1d89bf92..0000000000000000000000000000000000000000
Binary files a/html/images/setup/license.png and /dev/null differ
diff --git a/html/images/setup/migrate.png b/html/images/setup/migrate.png
deleted file mode 100644
index b636ff0e63d6eafa5864387d44848a632cf7561c..0000000000000000000000000000000000000000
Binary files a/html/images/setup/migrate.png and /dev/null differ
diff --git a/html/images/setup/server.png b/html/images/setup/server.png
deleted file mode 100644
index 313a66152b98589fc5ae888a8381231646403e21..0000000000000000000000000000000000000000
Binary files a/html/images/setup/server.png and /dev/null differ
diff --git a/html/images/setup/system.png b/html/images/setup/system.png
deleted file mode 100644
index b1505729e12a10336b9c2d7fd4adfec74e3c7455..0000000000000000000000000000000000000000
Binary files a/html/images/setup/system.png and /dev/null differ
diff --git a/html/images/setup/user.png b/html/images/setup/user.png
deleted file mode 100644
index 4a5332b5a6107e201b0ebceeaf6388da7145cbe4..0000000000000000000000000000000000000000
Binary files a/html/images/setup/user.png and /dev/null differ
diff --git a/html/images/setup/welcome.png b/html/images/setup/welcome.png
deleted file mode 100644
index 0964749c5744cf725dc46a3d202a9671195a917a..0000000000000000000000000000000000000000
Binary files a/html/images/setup/welcome.png and /dev/null differ
diff --git a/html/images/setup/locale.png b/html/themes/default/icons/48/apps/config-language.png
similarity index 100%
rename from html/images/setup/locale.png
rename to html/themes/default/icons/48/apps/config-language.png
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index bdf77bcf27e228536e91707568909768d37cfa33..37f99ffc59992d482a6e99531f58158dc4953f0d 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -227,6 +227,10 @@ class IconTheme
       array('applications','os-windows'),
       array('applications','windows'),
     ),
+    'applications/config-language'  => array(
+      array('applications','locale'),
+      array('applications','preferences-desktop-locale'),
+    ),
     'mimetypes/text-csv'            => array(
       array('mimetypes','x-office-spreadsheet'),
       array('mimetypes','text-x-generic'),
@@ -286,6 +290,12 @@ class IconTheme
       array('categories','preferences-other'),
       array('categories','preferences-system'),
     ),
+    'categories/checks'      => array(
+      array('actions','view-task'),
+      array('actions','view-calendar-tasks'),
+      array('actions','checkbox'),
+      array('status','task-complete'),
+    ),
     'devices/server'      => array(
       array('places','server'),
       array('places','network-server'),
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 66d751b4720fcf4d61a5f215df9bbb77f99fca8b..f77de31bb170e9d0a8878a85ef89174cbb6eadb5 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -25,7 +25,7 @@ class Step_Checks extends setup_step
   var $basic_checks   = array();
   var $config_checks  = array();
   var $is_writeable   = array();
-  var $header_image   = "images/setup/system.png";
+  var $header_image   = 'geticon.php?context=categories&icon=checks&size=48';
 
   function __construct()
   {
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 80db7223fe8e8de0ca6f8de95ec3271b7eaf5459..b85e0aab7d083d684fe2c755e40bf6d77da39e98 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -23,7 +23,7 @@
 class Step_Finish extends setup_step
 {
   var $cfg_file_written = FALSE;
-  var $header_image     = "images/setup/server.png";
+  var $header_image     = 'geticon.php?context=devices&icon=server&size=48';
 
   function __construct()
   {
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 4968043201063c24b66e97ddf3d32621962b0ce9..bea4835002165d0b0a3217382041f2abb5061b70 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -27,7 +27,7 @@ class Step_Language extends setup_step
   var $lang           = "en_EN";  /* Detected language */
   var $languages      = array();
   var $attributes     = array("lang","lang_selected");
-  var $header_image   = "images/setup/locale.png";
+  var $header_image   = 'geticon.php?context=applications&icon=config-language&size=48';
 
   function __construct()
   {
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index c35c79e9dc02a2f43aa0a93fd54eaaa1a614540b..d85d02442c7032489febaad64ad7018abe864eb6 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -42,7 +42,7 @@ class Step_Ldap extends setup_step
   var $attributes = array("connection","location","admin","password","base","admin_given",
                           "append_base_to_admin_dn","tls","rfc2307bis");
 
-  var $header_image = "images/setup/ldap.png";
+  var $header_image = 'geticon.php?context=places&icon=network-server&size=48';
 
   function __construct()
   {
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 28a0d08d1623c627bee0723f8a01edf999dcbadc..0427623cebada9f4dd86c76223c358e3d1626792 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -49,7 +49,7 @@ class Step_Migrate extends setup_step
 {
   var $languages      = array();
   var $attributes     = array('valid_admin');
-  var $header_image   = "images/setup/migrate.png";
+  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 2cb40114f6e7b6857944b1fd1d99ec0447fcf1b5..7515c1fd2814b07047d92b576d400035c4069056 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -36,11 +36,11 @@
         <!-- Inforamtion popup -->
         <div class='solution_visible' id='sol_{$key}'>
           {if $basic[$key].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')">
             {$basic[$key].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')">
             {$basic[$key].SOLUTION}<br/>
             <b>{t}FusionDirectory will run without fixing this.{/t}</b>
           {/if}