rearanged cache and fixed icon.php