New iconset and weapon data tweaked