Slot weapon icon changes, small fixes