Improvements in icons (old bug dont fixed yet)