diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index f418d79fb0a..2c0cfdc2901 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -514,12 +514,20 @@
 	path = /obj/item/clothing/accessory/bandanna/colorable
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/accessory/flagpatch_colorable
-	display_name = "generic flagpatch"
-	path = /obj/item/clothing/accessory/flagpatch
+/datum/gear/accessory/flagpatch
+	display_name = "generic flagpatch selection"
+	path = /obj/item/clothing/accessory/flagpatch/rectangular
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 	cost = 0
 
+/datum/gear/accessory/flagpatch/New()
+	..()
+	var/list/flagpatch = list()
+	flagpatch["rectangular flagpatch"] =  /obj/item/clothing/accessory/flagpatch/rectangular
+	flagpatch["triangular flagpatch"] = /obj/item/clothing/accessory/flagpatch/triangular
+	flagpatch["circular flagpatch"] =  /obj/item/clothing/accessory/flagpatch/circular
+	flagpatch["square flagpatch"] =  /obj/item/clothing/accessory/flagpatch/square
+	gear_tweaks += new /datum/gear_tweak/path(flagpatch)
 
 /datum/gear/accessory/flagpatch_national
 	display_name = "flagpatch selection"
@@ -629,4 +637,4 @@
 /datum/gear/accessory/visegradi_sweater
 	display_name = "visegradi patterned sweater"
 	path = /obj/item/clothing/accessory/sweater/visegradi
-	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
\ No newline at end of file
+	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm
index 3da4df047b1..e5e96571430 100644
--- a/code/modules/clothing/suits/modular_armor.dm
+++ b/code/modules/clothing/suits/modular_armor.dm
@@ -320,12 +320,40 @@
 	desc = "A simple strip of fabric attached to a vest or helmet typically used to denote the wearer's \
 	organization or nationality."
 	icon = 'icons/clothing/kit/modular_armor_accessories.dmi'
-	icon_state = "flagpatch_colorable"
-	item_state = "flagpatch_colorable"
+	icon_state = "flagpatch"
+	item_state = "flagpatch"
+	var/shading_state = "flagpatch"
 	contained_sprite = TRUE
 	slot = ACCESSORY_SLOT_GENERIC
 	flippable = FALSE
 
+/obj/item/clothing/accessory/flagpatch/Initialize()
+	. = ..()
+	var/icon/shading_icon
+	var/icon/flagpatch_icon = new(icon, icon_state)
+	if(shading_state)
+		shading_icon = new(icon, shading_state)
+		flagpatch_icon.Blend(shading_icon, ICON_MULTIPLY)
+		add_overlay(flagpatch_icon)
+
+/obj/item/clothing/accessory/flagpatch/rectangular
+	shading_state = null
+
+/obj/item/clothing/accessory/flagpatch/triangular
+	icon_state = "flagpatch_triangular"
+	item_state = "flagpatch_triangular"
+	shading_state = null
+
+/obj/item/clothing/accessory/flagpatch/circular
+	icon_state = "flagpatch_circular"
+	item_state = "flagpatch_circular"
+	shading_state = null
+
+/obj/item/clothing/accessory/flagpatch/square
+	icon_state = "flagpatch_square"
+	item_state = "flagpatch_square"
+	shading_state = null
+
 /obj/item/clothing/accessory/flagpatch/biesel
 	name = "republic of biesel flagpatch"
 	desc = "A flagpatch representing the Republic of Biesel. A common sight in the CRZ, they became incredibly popular \
@@ -440,6 +468,7 @@
 	holographic patches made of hardlight to make their affiliation clear no matter the conditions."
 	icon_state = "flagpatch_elyra"
 	item_state = "flagpatch_elyra"
+	shading_state = "flagpatch_triangular"
 
 /obj/item/clothing/accessory/flagpatch/konyang
 	name = "konyang flagpatch"
diff --git a/html/changelogs/wezzy_nienna_flagpatch.yml b/html/changelogs/wezzy_nienna_flagpatch.yml
new file mode 100644
index 00000000000..fe079e34609
--- /dev/null
+++ b/html/changelogs/wezzy_nienna_flagpatch.yml
@@ -0,0 +1,41 @@
+################################
+# 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: Wowzewow(Wezzy), NiennaB
+
+# 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:
+  - imageadd: "Adds more generic flagpatch shapes. Improves how flagpatch sprites are shaded."
diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi
index 9aa5ba76c09..88fd28591e1 100644
Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ