Bug fixed & icon update