diff --git a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
index a3367e4aa6..e054e65ac5 100644
--- a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -1,5 +1,7 @@
 /obj/item/gun/energy/e_gun
-	icon = 'modular_citadel/icons/obj/guns/energy.dmi'
+	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
+	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
 	ammo_x_offset = 2
 	flight_x_offset = 17
 	flight_y_offset = 11
\ No newline at end of file
diff --git a/modular_citadel/code/modules/projectiles/guns/energy/laser.dm b/modular_citadel/code/modules/projectiles/guns/energy/laser.dm
new file mode 100644
index 0000000000..316c976f6a
--- /dev/null
+++ b/modular_citadel/code/modules/projectiles/guns/energy/laser.dm
@@ -0,0 +1,17 @@
+/obj/item/gun/energy/laser
+	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
+	ammo_x_offset = 1
+	shaded_charge = 1
+	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
+
+/obj/item/gun/energy/laser/practice
+	icon_state = "laser-p"
+
+/obj/item/gun/energy/laser/bluetag
+	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+
+/obj/item/gun/energy/laser/redtag
+	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi b/modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi
new file mode 100644
index 0000000000..b438c7acee
Binary files /dev/null and b/modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi differ
diff --git a/modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi b/modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi
new file mode 100644
index 0000000000..dda226b046
Binary files /dev/null and b/modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi differ
diff --git a/modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi b/modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi
new file mode 100644
index 0000000000..9a902e0dff
Binary files /dev/null and b/modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi differ
diff --git a/modular_citadel/icons/obj/guns/energy.dmi b/modular_citadel/icons/obj/guns/energy.dmi
deleted file mode 100644
index 21d348b66e..0000000000
Binary files a/modular_citadel/icons/obj/guns/energy.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index cae3e0521a..8debd4146e 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2620,6 +2620,7 @@
 #include "modular_citadel\code\modules\power\lighting.dm"
 #include "modular_citadel\code\modules\projectiles\guns\ballistic\revolver.dm"
 #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm"
+#include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm"
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\code\modules\research\designs\machine_designs.dm"
 #include "modular_citadel\code\modules\research\techweb\_techweb.dm"