diff --git a/code/game/objects/items/gunbox.dm b/code/game/objects/items/gunbox.dm
index c8760f72f94..7b998c169d3 100644
--- a/code/game/objects/items/gunbox.dm
+++ b/code/game/objects/items/gunbox.dm
@@ -9,8 +9,10 @@
 	w_class = ITEMSIZE_HUGE
 /obj/item/gunbox/attack_self(mob/living/user)
 	var/list/options = list()
-	options[".45 Pistol"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
-	options[".45 Revolver"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber)
+	options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
+	options["MT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
+	options["MarsTech R1 (.45)"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber)
+	options["MarsTech P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber)
 	var/choice = tgui_input_list(user,"Would you prefer a pistol or a revolver?", "Gun!", options)
 	if(src && choice)
 		var/list/things_to_spawn = options[choice]
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 7e714cb0489..892fd38f585 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -80,11 +80,15 @@
 	..()
 */
 
+/*
+ * Security Sidearm
+ */
 /obj/item/weapon/gun/projectile/sec
 	name = ".45 pistol"
 	desc = "The MT Mk58 is a cheap, ubiquitous sidearm, produced by MarsTech. Found pretty much everywhere humans are. Uses .45 rounds."
-	description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
-	icon_state = "secguncomp"
+	description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \
+	MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
+	icon_state = "secgun"
 	magazine_type = /obj/item/ammo_magazine/m45/rubber
 	allowed_magazines = list(/obj/item/ammo_magazine/m45)
 	projectile_type = /obj/item/projectile/bullet/pistol/medium
@@ -95,9 +99,9 @@
 /obj/item/weapon/gun/projectile/sec/update_icon()
 	..()
 	if(ammo_magazine)
-		icon_state = "secguncomp"
+		icon_state = "secgun"
 	else
-		icon_state = "secguncomp-e"
+		icon_state = "secgun-e"
 
 /obj/item/weapon/gun/projectile/sec/flash
 	name = ".45 signal pistol"
@@ -106,18 +110,21 @@
 /obj/item/weapon/gun/projectile/sec/wood
 	desc = "The MT Mk58 is a cheap, ubiquitous sidearm, produced by MarsTech. This one has a sweet wooden grip. Uses .45 rounds."
 	name = "custom .45 Pistol"
-	icon_state = "secgundark"
+	icon_state = "secgunb"
 
 /obj/item/weapon/gun/projectile/sec/wood/update_icon()
 	..()
 	if(ammo_magazine)
-		icon_state = "secgundark"
+		icon_state = "secgunb"
 	else
-		icon_state = "secgundark-e"
+		icon_state = "secgunb-e"
 
+/*
+ * Silenced Pistol
+ */
 /obj/item/weapon/gun/projectile/silenced
 	name = "silenced pistol"
-	desc = "A small, quiet,  easily concealable gun. Uses .45 rounds."
+	desc = "A small, quiet, easily concealable gun with a built-in silencer. Uses .45 rounds."
 	icon_state = "silenced_pistol"
 	w_class = ITEMSIZE_NORMAL
 	caliber = ".45"
@@ -133,6 +140,9 @@
 /obj/item/weapon/gun/projectile/silenced/empty
 	magazine_type = null
 
+/*
+ * Deagle
+ */
 /obj/item/weapon/gun/projectile/deagle
 	name = "hand cannon"
 	desc = "The PCA-55 Rarkajar perfect handgun for shooters with a need to hit targets through a wall and behind a fridge in your neighbor's house. Uses .44 rounds."
@@ -165,6 +175,9 @@
 	icon_state = "deaglecamo"
 	item_state = "deagleg"
 
+/*
+ * Gyro Pistol (Admin Abuse in gun form)
+ */
 /obj/item/weapon/gun/projectile/gyropistol // Does this even appear anywhere outside of admin abuse?
 	name = "gyrojet pistol"
 	desc = "Speak softly, and carry a big gun. Fires rare .75 caliber self-propelled exploding bolts--because fuck you and everything around you."
@@ -187,6 +200,9 @@
 	else
 		icon_state = "gyropistol"
 
+/*
+ * Compact Pistol
+ */
 /obj/item/weapon/gun/projectile/pistol
 	name = "compact pistol"
 	desc = "The Lumoco Arms P3 Whisper. A compact, easily concealable gun, though it's only compatible with compact magazines. Uses 9mm rounds."
@@ -240,6 +256,9 @@
 	else
 		icon_state = "pistol"
 
+/*
+ * Silencer
+ */
 /obj/item/weapon/silencer
 	name = "silencer"
 	desc = "a silencer"
@@ -247,6 +266,9 @@
 	icon_state = "silencer"
 	w_class = ITEMSIZE_SMALL
 
+/*
+ * Zip Gun (yar har)
+ */
 /obj/item/weapon/gun/projectile/pirate
 	name = "zip gun"
 	desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems."
@@ -281,6 +303,9 @@
 	caliber = initial(ammo.caliber)
 	..()
 
+/*
+ * Derringer
+ */
 /obj/item/weapon/gun/projectile/derringer
 	name = "derringer"
 	desc = "It's not size of your gun that matters, just the size of your load. Uses .357 rounds." //OHHH MYYY~
@@ -294,6 +319,9 @@
 	ammo_type = /obj/item/ammo_casing/a357
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
+/*
+ * Luger
+ */
 /obj/item/weapon/gun/projectile/luger
 	name = "\improper Jindal T15 Chooha"
 	desc = "Almost seventy percent guaranteed not to be a cheap rimworld knockoff! Accuracy, easy handling, and its distinctive appearance make it popular among gun collectors. Uses 9mm rounds."
@@ -322,6 +350,9 @@
 	(Perhaps owing to its less than prestigious image), instead being sold almost exclusively through retailers and advertising platforms targeting the 'independent roughneck' demographic."
 	icon_state = "p08b"
 
+/*
+ * P92X (9mm Pistol)
+ */
 /obj/item/weapon/gun/projectile/p92x
 	name = "9mm pistol"
 	desc = "A widespread MarsTech sidearm called the P92X which is used by military, police, and security forces across the galaxy. Uses 9mm rounds."
@@ -339,8 +370,11 @@
 	else
 		icon_state = "[initial(icon_state)]-e"
 
+/obj/item/weapon/gun/projectile/p92x/rubber
+	magazine_type = /obj/item/ammo_magazine/m9mm/rubber
+
 /obj/item/weapon/gun/projectile/p92x/brown
-	icon_state = "p92x-brown"
+	icon_state = "p92xb"
 
 /obj/item/weapon/gun/projectile/p92x/large
 	magazine_type = /obj/item/ammo_magazine/m9mm/large // Spawns with illegal magazines.
\ No newline at end of file
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index d76296effba..14147bf9fb5 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ