diff --git a/mojotrollz/autoload.inc.php b/mojotrollz/autoload.inc.php
index e45cd07..c731cd8 100644
--- a/mojotrollz/autoload.inc.php
+++ b/mojotrollz/autoload.inc.php
@@ -5,4 +5,5 @@ require_once dirname(__FILE__).'/path/register_path_classes.php';
 require_once dirname(__FILE__).'/page/register_page_classes.php';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
 require_once dirname(__FILE__).'/api/autoload.inc.php';
-require_once dirname(__FILE__).'/docu/autoload.inc.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/docu/autoload.inc.php';
+require_once dirname(__FILE__).'/img/autoload.inc.php';
\ No newline at end of file
diff --git a/mojotrollz/img/autoload.inc.php b/mojotrollz/img/autoload.inc.php
new file mode 100644
index 0000000..e137e6a
--- /dev/null
+++ b/mojotrollz/img/autoload.inc.php
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+require_once dirname(__FILE__).'/register_img.php';
\ No newline at end of file
diff --git a/mojotrollz/img/register_img.php b/mojotrollz/img/register_img.php
new file mode 100644
index 0000000..76c528c
--- /dev/null
+++ b/mojotrollz/img/register_img.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/wowicons/','wowicons','*.png');
\ No newline at end of file
diff --git a/mojotrollz/page/default_page/img/arrow_down.png b/mojotrollz/img/wowicons/arrow_down.png
similarity index 100%
rename from mojotrollz/page/default_page/img/arrow_down.png
rename to mojotrollz/img/wowicons/arrow_down.png
diff --git a/mojotrollz/page/default_page/img/arrow_left.png b/mojotrollz/img/wowicons/arrow_left.png
similarity index 100%
rename from mojotrollz/page/default_page/img/arrow_left.png
rename to mojotrollz/img/wowicons/arrow_left.png
diff --git a/mojotrollz/page/default_page/img/arrow_right.png b/mojotrollz/img/wowicons/arrow_right.png
similarity index 100%
rename from mojotrollz/page/default_page/img/arrow_right.png
rename to mojotrollz/img/wowicons/arrow_right.png
diff --git a/mojotrollz/page/default_page/img/arrow_up.png b/mojotrollz/img/wowicons/arrow_up.png
similarity index 100%
rename from mojotrollz/page/default_page/img/arrow_up.png
rename to mojotrollz/img/wowicons/arrow_up.png
diff --git a/mojotrollz/page/wizard_details/img/druid.png b/mojotrollz/img/wowicons/druid.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/druid.png
rename to mojotrollz/img/wowicons/druid.png
diff --git a/mojotrollz/page/wizard_details/img/dwarf_female.png b/mojotrollz/img/wowicons/dwarf_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/dwarf_female.png
rename to mojotrollz/img/wowicons/dwarf_female.png
diff --git a/mojotrollz/page/wizard_details/img/dwarf_male.png b/mojotrollz/img/wowicons/dwarf_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/dwarf_male.png
rename to mojotrollz/img/wowicons/dwarf_male.png
diff --git a/mojotrollz/page/wizard_details/img/female.png b/mojotrollz/img/wowicons/female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/female.png
rename to mojotrollz/img/wowicons/female.png
diff --git a/mojotrollz/page/wizard_details/img/gnome_female.png b/mojotrollz/img/wowicons/gnome_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/gnome_female.png
rename to mojotrollz/img/wowicons/gnome_female.png
diff --git a/mojotrollz/page/wizard_details/img/gnome_male.png b/mojotrollz/img/wowicons/gnome_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/gnome_male.png
rename to mojotrollz/img/wowicons/gnome_male.png
diff --git a/mojotrollz/page/default_page/img/help_questionmark.png b/mojotrollz/img/wowicons/help_questionmark.png
similarity index 100%
rename from mojotrollz/page/default_page/img/help_questionmark.png
rename to mojotrollz/img/wowicons/help_questionmark.png
diff --git a/mojotrollz/page/wizard_details/img/human_female.png b/mojotrollz/img/wowicons/human_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/human_female.png
rename to mojotrollz/img/wowicons/human_female.png
diff --git a/mojotrollz/page/wizard_details/img/human_male.png b/mojotrollz/img/wowicons/human_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/human_male.png
rename to mojotrollz/img/wowicons/human_male.png
diff --git a/mojotrollz/page/wizard_details/img/hunter.png b/mojotrollz/img/wowicons/hunter.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/hunter.png
rename to mojotrollz/img/wowicons/hunter.png
diff --git a/mojotrollz/page/wizard_details/img/mage.png b/mojotrollz/img/wowicons/mage.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/mage.png
rename to mojotrollz/img/wowicons/mage.png
diff --git a/mojotrollz/page/wizard_details/img/male.png b/mojotrollz/img/wowicons/male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/male.png
rename to mojotrollz/img/wowicons/male.png
diff --git a/mojotrollz/page/wizard_details/img/nightelf_female.png b/mojotrollz/img/wowicons/nightelf_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/nightelf_female.png
rename to mojotrollz/img/wowicons/nightelf_female.png
diff --git a/mojotrollz/page/wizard_details/img/nightelf_male.png b/mojotrollz/img/wowicons/nightelf_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/nightelf_male.png
rename to mojotrollz/img/wowicons/nightelf_male.png
diff --git a/mojotrollz/page/wizard_details/img/ork_female.png b/mojotrollz/img/wowicons/ork_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/ork_female.png
rename to mojotrollz/img/wowicons/ork_female.png
diff --git a/mojotrollz/page/wizard_details/img/ork_male.png b/mojotrollz/img/wowicons/ork_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/ork_male.png
rename to mojotrollz/img/wowicons/ork_male.png
diff --git a/mojotrollz/page/wizard_details/img/paladin.png b/mojotrollz/img/wowicons/paladin.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/paladin.png
rename to mojotrollz/img/wowicons/paladin.png
diff --git a/mojotrollz/page/wizard_details/img/priest.png b/mojotrollz/img/wowicons/priest.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/priest.png
rename to mojotrollz/img/wowicons/priest.png
diff --git a/mojotrollz/page/wizard_details/img/rogue.png b/mojotrollz/img/wowicons/rogue.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/rogue.png
rename to mojotrollz/img/wowicons/rogue.png
diff --git a/mojotrollz/page/wizard_details/img/shaman.png b/mojotrollz/img/wowicons/shaman.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/shaman.png
rename to mojotrollz/img/wowicons/shaman.png
diff --git a/mojotrollz/page/wizard_details/img/tauren_female.png b/mojotrollz/img/wowicons/tauren_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/tauren_female.png
rename to mojotrollz/img/wowicons/tauren_female.png
diff --git a/mojotrollz/page/wizard_details/img/tauren_male.png b/mojotrollz/img/wowicons/tauren_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/tauren_male.png
rename to mojotrollz/img/wowicons/tauren_male.png
diff --git a/mojotrollz/page/wizard_details/img/troll_female.png b/mojotrollz/img/wowicons/troll_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/troll_female.png
rename to mojotrollz/img/wowicons/troll_female.png
diff --git a/mojotrollz/page/wizard_details/img/troll_male.png b/mojotrollz/img/wowicons/troll_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/troll_male.png
rename to mojotrollz/img/wowicons/troll_male.png
diff --git a/mojotrollz/page/wizard_details/img/undead_female.png b/mojotrollz/img/wowicons/undead_female.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/undead_female.png
rename to mojotrollz/img/wowicons/undead_female.png
diff --git a/mojotrollz/page/wizard_details/img/undead_male.png b/mojotrollz/img/wowicons/undead_male.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/undead_male.png
rename to mojotrollz/img/wowicons/undead_male.png
diff --git a/mojotrollz/page/wizard_details/img/warlock.png b/mojotrollz/img/wowicons/warlock.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/warlock.png
rename to mojotrollz/img/wowicons/warlock.png
diff --git a/mojotrollz/page/wizard_details/img/warrior.png b/mojotrollz/img/wowicons/warrior.png
similarity index 100%
rename from mojotrollz/page/wizard_details/img/warrior.png
rename to mojotrollz/img/wowicons/warrior.png
diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php
index d339e65..204382f 100644
--- a/mojotrollz/page/default_page/default_page.php
+++ b/mojotrollz/page/default_page/default_page.php
@@ -9,8 +9,6 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.sha1.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/wizard.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'wizard_details/js/wizard_details.js').'"></script>';
-
-              
     }
       
    private function css (){
@@ -23,9 +21,9 @@ class default_page extends SYSTEM\PAGE\Page {
         $vars = array();               
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_page/img/');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);
-        
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);        
     }
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/default_page.tpl
index abad412..e80f292 100644
--- a/mojotrollz/page/default_page/default_page.tpl
+++ b/mojotrollz/page/default_page/default_page.tpl
@@ -43,9 +43,9 @@
                             </div>
                         </div>
                         <div style="clear: both;"></div>
-                        <div id="back" style="float: left; display: none;"><a href="#"><img src="${PICPATH}arrow_left.png"/></a></div>
+                        <div id="back" style="float: left; display: none;"><a href="#"><img src="${WOWICONS}arrow_left.png"/></a></div>
                         <div id="start" style="float: left;"><a href="#"><img src="${PICPATH}button.png"/></a></div>
-                        <div id="next" style="float: right; display: none;"><a href="#"><img src="${PICPATH}arrow_right.png"/></a></div>                        
+                        <div id="next" style="float: right; display: none;"><a href="#"><img src="${WOWICONS}arrow_right.png"/></a></div>                        
                         <div id="register" style="float: right; display: none;"><a href="#"><img src="${PICPATH}register_button.png"/></a></div>
                     </div>
                     <div class="right" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>              
diff --git a/mojotrollz/page/wizard_details/details.tpl b/mojotrollz/page/wizard_details/details.tpl
index 7b374a2..bda86fc 100644
--- a/mojotrollz/page/wizard_details/details.tpl
+++ b/mojotrollz/page/wizard_details/details.tpl
@@ -6,45 +6,45 @@
     <br>
     <br>
     <br>
-    <a class="male fadein" href="#"><img src="${PICPATH}male.png" width="110px"/></a>
-    <a class="female fadein" href="#"><img src="${PICPATH}female.png" width="110px"/></a>
+    <a class="male fadein" href="#"><img src="${WOWICONS}male.png" width="110px"/></a>
+    <a class="female fadein" href="#"><img src="${WOWICONS}female.png" width="110px"/></a>
 </div>
 <div id="details_race" style="float: left; margin: 15px;">
-    <a class="male human fadein" href="#"><img src="${PICPATH}human_male.png"/></a>
-    <a class="female human fadein" href="#"><img src="${PICPATH}human_female.png" /></a>
-    <a class="male ork fadein" href="#"><img src="${PICPATH}ork_male.png" /></a>
-    <a class="female ork fadein" href="#"><img src="${PICPATH}ork_female.png" /></a>
+    <a class="male human fadein" href="#"><img src="${WOWICONS}human_male.png"/></a>
+    <a class="female human fadein" href="#"><img src="${WOWICONS}human_female.png" /></a>
+    <a class="male ork fadein" href="#"><img src="${WOWICONS}ork_male.png" /></a>
+    <a class="female ork fadein" href="#"><img src="${WOWICONS}ork_female.png" /></a>
     <br>
-    <a class="male dwarf fadein" href="#"><img src="${PICPATH}dwarf_male.png" /></a>
-    <a class="female dwarf fadein" href="#"><img src="${PICPATH}dwarf_female.png" /></a>
-    <a class="male undead fadein" href="#"><img src="${PICPATH}undead_male.png" /></a>
-    <a class="female undead fadein" href="#"><img class="select" src="${PICPATH}undead_female.png" /></a>
+    <a class="male dwarf fadein" href="#"><img src="${WOWICONS}dwarf_male.png" /></a>
+    <a class="female dwarf fadein" href="#"><img src="${WOWICONS}dwarf_female.png" /></a>
+    <a class="male undead fadein" href="#"><img src="${WOWICONS}undead_male.png" /></a>
+    <a class="female undead fadein" href="#"><img class="select" src="${WOWICONS}undead_female.png" /></a>
     <br>
-    <a class="male nightelf fadein" href="#"><img src="${PICPATH}nightelf_male.png" /></a>
-    <a class="female nightelf fadein" href="#"><img src="${PICPATH}nightelf_female.png" /></a>
-    <a class="male tauren fadein" href="#"><img src="${PICPATH}tauren_male.png" /></a>
-    <a class="female tauren fadein" href="#"><img src="${PICPATH}tauren_female.png" /></a>
+    <a class="male nightelf fadein" href="#"><img src="${WOWICONS}nightelf_male.png" /></a>
+    <a class="female nightelf fadein" href="#"><img src="${WOWICONS}nightelf_female.png" /></a>
+    <a class="male tauren fadein" href="#"><img src="${WOWICONS}tauren_male.png" /></a>
+    <a class="female tauren fadein" href="#"><img src="${WOWICONS}tauren_female.png" /></a>
     <br>
-    <a class="male gnome fadein" href="#"><img src="${PICPATH}gnome_male.png" /></a>
-    <a class="female gnome fadein" href="#"><img src="${PICPATH}gnome_female.png" /></a>
-    <a class="male troll fadein" href="#"><img src="${PICPATH}troll_male.png" /></a>
-    <a class="female troll fadein" href="#"><img src="${PICPATH}troll_female.png" /></a>
+    <a class="male gnome fadein" href="#"><img src="${WOWICONS}gnome_male.png" /></a>
+    <a class="female gnome fadein" href="#"><img src="${WOWICONS}gnome_female.png" /></a>
+    <a class="male troll fadein" href="#"><img src="${WOWICONS}troll_male.png" /></a>
+    <a class="female troll fadein" href="#"><img src="${WOWICONS}troll_female.png" /></a>
 </div>
 <div id="details_class" style="float: left; margin: 15px;">
-    <a class="human dwarf nightelf gnome ork undead tauren troll fadein" href="#"><img src="${PICPATH}warrior.png" /></a>
-    <a class="dwarf nightelf ork tauren troll fadein" href="#"><img src="${PICPATH}hunter.png" /></a>
+    <a class="human dwarf nightelf gnome ork undead tauren troll fadein" href="#"><img src="${WOWICONS}warrior.png" /></a>
+    <a class="dwarf nightelf ork tauren troll fadein" href="#"><img src="${WOWICONS}hunter.png" /></a>
     <br>
-    <a class="dwarf human fadein" href="#"><img src="${PICPATH}paladin.png" /></a>
-    <a class="dwarf human nightelf gnome ork undead troll fadein" href="#"><img src="${PICPATH}rogue.png" /></a>
+    <a class="dwarf human fadein" href="#"><img src="${WOWICONS}paladin.png" /></a>
+    <a class="dwarf human nightelf gnome ork undead troll fadein" href="#"><img src="${WOWICONS}rogue.png" /></a>
     <br>
-    <a class="dwarf human nightelf undead troll fadein" href="#"><img src="${PICPATH}priest.png" /></a>
-    <a class="human gnome undead troll fadein" href="#"><img src="${PICPATH}mage.png" /></a>
+    <a class="dwarf human nightelf undead troll fadein" href="#"><img src="${WOWICONS}priest.png" /></a>
+    <a class="human gnome undead troll fadein" href="#"><img src="${WOWICONS}mage.png" /></a>
     <br> 
-    <a class="human gnome ork undead fadein" href="#"><img src="${PICPATH}warlock.png" /></a>
-    <a class="fadein nightelf tauren" href="#"><img src="${PICPATH}druid.png" /></a>
+    <a class="human gnome ork undead fadein" href="#"><img src="${WOWICONS}warlock.png" /></a>
+    <a class="fadein nightelf tauren" href="#"><img src="${WOWICONS}druid.png" /></a>
 </div>
 
 <div class="lifecraft link-color" id="details_info" style="float: left; margin-top: 15px; width: 190px; padding: 8px; padding-bottom: 110px; font-size: 14px; background: url(${PICPATH}infotext_background.png) no-repeat;">
-    <h3 style="padding-left: 20px;"><img src="${PICPATH}help_questionmark.png" width="25px"/>&nbsp;&nbsp;Info</h3>
+    <h3 style="padding-left: 20px;"><img src="${WOWICONS}help_questionmark.png" width="25px"/>&nbsp;&nbsp;Info</h3>
     ${infotext_human}
 </div>
diff --git a/mojotrollz/page/wizard_details/img/help_questionmark.png b/mojotrollz/page/wizard_details/img/help_questionmark.png
deleted file mode 100644
index 386888f..0000000
Binary files a/mojotrollz/page/wizard_details/img/help_questionmark.png and /dev/null differ
diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php
index a7f28e7..82c7879 100644
--- a/mojotrollz/page/wizard_details/wizard_details.php
+++ b/mojotrollz/page/wizard_details/wizard_details.php
@@ -16,6 +16,7 @@ class wizard_details extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_details/img/');
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_RACES));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/details.tpl'), $vars);
diff --git a/mojotrollz/page/wizard_friend/friend.tpl b/mojotrollz/page/wizard_friend/friend.tpl
index 27d1833..f31b632 100644
--- a/mojotrollz/page/wizard_friend/friend.tpl
+++ b/mojotrollz/page/wizard_friend/friend.tpl
@@ -6,8 +6,8 @@
         <div class="" style="outline: 2px white; background: url(${PICPATH}wall.png); height: 200px;">
             <div style="background: url(${PICPATH}background2.png);">
                 <div style="float: left; padding: 5px;">Molanor</div>
-            <img src="${PICPATH}warrior.png" width="30px;"/>
-            <img src="${PICPATH}ork_male.png" width="30px;"/>
+            <img src="${WOWICONS}warrior.png" width="30px;"/>
+            <img src="${WOWICONS}ork_male.png" width="30px;"/>
             <img src="${PICPATH}x.png" style="float: right; padding: 7px;"/>
             </div>
         </div>
diff --git a/mojotrollz/page/wizard_friend/img/ork_male.png b/mojotrollz/page/wizard_friend/img/ork_male.png
deleted file mode 100644
index d74fb3e..0000000
Binary files a/mojotrollz/page/wizard_friend/img/ork_male.png and /dev/null differ
diff --git a/mojotrollz/page/wizard_friend/img/warrior.png b/mojotrollz/page/wizard_friend/img/warrior.png
deleted file mode 100644
index 7051fab..0000000
Binary files a/mojotrollz/page/wizard_friend/img/warrior.png and /dev/null differ
diff --git a/mojotrollz/page/wizard_friend/wizard_friend.php b/mojotrollz/page/wizard_friend/wizard_friend.php
index 7696c69..5412cb3 100644
--- a/mojotrollz/page/wizard_friend/wizard_friend.php
+++ b/mojotrollz/page/wizard_friend/wizard_friend.php
@@ -34,6 +34,7 @@ class wizard_friend extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_friend/img/');
+        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_friend/friend.tpl'), $vars);