diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 59660b75785..7290a916813 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -219,7 +219,7 @@
 	name = "bullpup carbine"
 	desc = "A variant of the ZI Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, chambered in the same 5.56 caliber but only capable of accepting smaller magazines. It lacks the integral grenade launcher and the burst fire of the Bulldog."
 	desc_extended = "It makes you feel like a corporate goon when you hold it."
-	icon = 'icons/obj/guns/civcarbine.dmi'
+	icon = 'icons/obj/guns/crew_rifle.dmi'
 	magazine_type = /obj/item/ammo_magazine/a556/carbine/polymer
 	allowed_magazines = list(/obj/item/ammo_magazine/a556/carbine, /obj/item/ammo_magazine/a556/carbine/polymer)
 	icon_state = "civcarbine"
@@ -341,11 +341,11 @@
 
 /obj/item/gun/projectile/automatic/rifle/jingya
 	name = "burst rifle"
-	desc = "The Jingya A-1 is the first of a new line of NanoTrasen rifles, developed in cooperation with Zavodskoi Interstellar's Kumar Arms subsidiary. They are made to be sleek, easy to use by users with minimal training and cheap to mass produce while still being reliable."
+	desc = "The Jingya A-1 is the first of a new line of NanoTrasen rifles, developed in cooperation with Zavodskoi Interstellar's Kumar Arms subsidiary. Primarily made of high strength polymers, the rifle is designed to be cheap to mass produce while remaining reliable."
 	desc_extended = "The Jingya A-1 won a hard-fought victory in the ballistic side of the SCC Future Firearms contest hosted in 2463, which was also its first unveiling: this rifle is made to function where laser weaponry may be either too risky or not functional for the engagement at hand. It is slated to be deployed for trial usage by a select few special TCFL regiments in Mictlan."
-	icon = 'icons/obj/guns/crew_rifle.dmi'
-	icon_state = "arifle"
-	item_state = "arifle"
+	icon = 'icons/obj/guns/burst_rifle.dmi'
+	icon_state = "arx"
+	item_state = "arx"
 	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "a556"
@@ -366,9 +366,9 @@
 /obj/item/gun/projectile/automatic/rifle/jingya/update_icon()
 	..()
 	if(ammo_magazine)
-		icon_state = "arifle"
+		icon_state = "arx"
 	else
-		icon_state = "arifle-empty"
+		icon_state = "arx-empty"
 
 /obj/item/gun/projectile/automatic/rifle/l6_saw
 	name = "light machine gun"
diff --git a/html/changelogs/bluntforce420tuna.yml b/html/changelogs/bluntforce420tuna.yml
new file mode 100644
index 00000000000..8103f5d0a47
--- /dev/null
+++ b/html/changelogs/bluntforce420tuna.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: BLUNTFORCE420
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Resprites the burst rifle."
+  - tweak: "Changes DMI names for crew armory rifle and burst rifle for organization purposes."
+
diff --git a/icons/obj/guns/burst_rifle.dmi b/icons/obj/guns/burst_rifle.dmi
new file mode 100644
index 00000000000..9794dda6356
Binary files /dev/null and b/icons/obj/guns/burst_rifle.dmi differ
diff --git a/icons/obj/guns/civcarbine.dmi b/icons/obj/guns/civcarbine.dmi
deleted file mode 100644
index a24b0cb17e9..00000000000
Binary files a/icons/obj/guns/civcarbine.dmi and /dev/null differ
diff --git a/icons/obj/guns/crew_rifle.dmi b/icons/obj/guns/crew_rifle.dmi
index 6142ebc53a9..a24b0cb17e9 100644
Binary files a/icons/obj/guns/crew_rifle.dmi and b/icons/obj/guns/crew_rifle.dmi differ