Code cleaning + icon update