diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index d8802045ba9..049bf13c174 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -275,10 +275,13 @@
 	projectile_type = /obj/item/projectile/beam/emitter
 	muzzle_flash_color = LIGHT_COLOR_GREEN
 	fire_sound = 'sound/weapons/emitter.ogg'
-	e_cost = 500 // about 28 shots on an engineering borg from a borging machine, assuming some power is used for lights / movement. May need to change.
-	delay = 3 SECONDS // Lasers fire every second
+	e_cost = 100
+	delay = 2 SECONDS // Lasers fire twice every second for 40 dps, this fires every 2 seconds for 15 dps. Seems fair, since every cyborg will have this with more shots?
 	select_name = "emitter"
 
+/obj/item/ammo_casing/energy/emitter/cyborg
+	e_cost = 500 // about 28 shots on an engineering borg from a borging machine, assuming some power is used for lights / movement. May need to change.
+
 /obj/item/ammo_casing/energy/bsg
 	projectile_type = /obj/item/projectile/energy/bsg
 	muzzle_flash_color = LIGHT_COLOR_DARKBLUE
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index d6284adb0c0..c30119f3be6 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -143,10 +143,11 @@
 
 /obj/item/gun/energy/emitter
 	name = "mobile emitter"
-	desc = "An emitter someone removed from its base, and an attached to a power cell, to try to make a weapon."
-	icon_state = "lasercannon"
+	desc = "An emitter someone removed from its base, and attached to a laser cannon frame, to try to make a weapon."
+	icon_state = "emittercannon"
 	item_state = "laser"
 	w_class = WEIGHT_CLASS_BULKY
+	shaded_charge = TRUE
 	can_holster = FALSE
 	origin_tech = "combat=4;magnets=4;powerstorage=3"
 	ammo_type = list(/obj/item/ammo_casing/energy/emitter)
@@ -154,7 +155,8 @@
 
 /obj/item/gun/energy/emitter/cyborg
 	name = "mounted emitter"
-	desc = "An emitter mounted to your cyborg frame, draining charge from your cell."
+	desc = "An emitter built into to your cyborg frame, draining charge from your cell."
+	ammo_type = list(/obj/item/ammo_casing/energy/emitter/cyborg)
 
 /obj/item/gun/energy/emitter/cyborg/newshot()
 	..()
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index b4f2c2204ab..4adf1a45e30 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ