New shield and sword icons, fix players fighting.