Changes on Icons and minor stuffs