diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index dcd10cfb5d8..7bc09593e5e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -339,7 +339,7 @@
 		new /obj/item/ammo_box/c38(src)
 		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		new /obj/item/taperoll/police(src)
-		new /obj/item/weapon/storage/belt/holster(src)
+		new /obj/item/clothing/tie/holster/armpit(src)
 		return
 
 /obj/structure/closet/secure_closet/detective/update_icon()
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 7b847a09faa..5bf9e1cb75f 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -176,11 +176,12 @@
 	_color = "medgreen"
 
 /obj/item/clothing/tie/holster
-	name = "shoulder holster"
+	name = "large shoulder holster"
 	desc = "A handgun holster."
 	icon_state = "holster"
 	_color = "holster"
 	var/obj/item/weapon/gun/holstered = null
+	var/holster_allow = /obj/item/weapon/gun
 	icon_action_button = "action_holster"
 
 /obj/item/clothing/tie/holster/attack_self()
@@ -191,27 +192,27 @@
 	if(usr.stat) return
 
 	if(!holstered)
-		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
-			usr << "\blue You need your gun equiped to holster it."
+		if(!istype(usr.get_active_hand(), holster_allow))
+			usr << "<span class='notice'>You can't fit that in the holster.</span>"
 			return
 		var/obj/item/weapon/gun/W = usr.get_active_hand()
 		if (!W.isHandgun())
-			usr << "\red This gun won't fit in \the [src]!"
+			usr << "<span class='warning'>This gun won't fit in \the [src]!</span>"
 			return
 		holstered = usr.get_active_hand()
 		usr.drop_item()
 		holstered.loc = src
-		usr.visible_message("\blue \The [usr] holsters \the [holstered].", "You holster \the [holstered].")
+		usr.visible_message("<span class='notice'>\The [usr] holsters \the [holstered].", "<span class='notice'>You holster \the [holstered].</span>")
 	else
 		if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj))
-			usr << "\red You need an empty hand to draw the gun!"
+			usr << "<span class='warning'>You need an empty hand to draw the gun!</span>"
 		else
 			if(usr.a_intent == "harm")
-				usr.visible_message("\red \The [usr] draws \the [holstered], ready to shoot!", \
-				"\red You draw \the [holstered], ready to shoot!")
+				usr.visible_message("<span class='warning'>\The [usr] draws \the [holstered], ready to shoot!</span>", \
+				"<span class='warning'>You draw \the [holstered], ready to shoot!</span>")
 			else
-				usr.visible_message("\blue \The [usr] draws \the [holstered], pointing it at the ground.", \
-				"\blue You draw \the [holstered], pointing it at the ground.")
+				usr.visible_message("<span class='notice'>\The [usr] draws \the [holstered], pointing it at the ground.</span>", \
+				"<span class='notice'>You draw \the [holstered], pointing it at the ground.</span>")
 			usr.put_in_hands(holstered)
 			holstered = null
 
@@ -220,6 +221,7 @@
 	desc = "A worn-out handgun holster. Perfect for concealed carry"
 	icon_state = "holster"
 	_color = "holster"
+	holster_allow = /obj/item/weapon/gun/projectile
 
 /obj/item/clothing/tie/storage
 	name = "load bearing equipment"
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 5e53c71efa9..d1d7e471f1b 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -9,6 +9,8 @@
 	fire_sound = 'sound/effects/Explosion1.ogg'
 	origin_tech = "combat=3"
 	mag_type = "/obj/item/ammo_box/magazine/m75"
+	isHandgun()
+		return 1
 
 /obj/item/weapon/gun/projectile/automatic/gyropistol/New()
 	..()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 26555a3b040..108e6977e11 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -6,6 +6,8 @@
 	origin_tech = "combat=2;materials=2;syndicate=2"
 	mag_type = "/obj/item/ammo_box/magazine/m10mm"
 	can_suppress = 1
+	isHandgun()
+		return 1
 
 /obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
 	..()
@@ -19,6 +21,8 @@
 	w_class = 3.0
 	origin_tech = "combat=3;materials=2"
 	mag_type = "/obj/item/ammo_box/magazine/m45"
+	isHandgun()
+		return 1
 
 
 /obj/item/weapon/gun/projectile/automatic/m2411/update_icon()
@@ -32,6 +36,8 @@
 	icon_state = "deagle"
 	force = 14.0
 	mag_type = "/obj/item/ammo_box/magazine/m50"
+	isHandgun()
+		return 1
 
 /obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
 	..()