Minor changes and bug resolve + icon PSD add