change icon and small fix