diff --git a/code/game/machinery/kitchen/icecream.dm b/code/game/machinery/kitchen/icecream.dm
index 09cb3289ed..35b41bafbd 100644
--- a/code/game/machinery/kitchen/icecream.dm
+++ b/code/game/machinery/kitchen/icecream.dm
@@ -2,8 +2,10 @@
 #define ICECREAM_CHOCOLATE 2
 #define ICECREAM_STRAWBERRY 3
 #define ICECREAM_BLUE 4
-#define CONE_WAFFLE 5
-#define CONE_CHOC 6
+#define ICECREAM_MATCHA 5
+#define CONE_WAFFLE 6
+#define CONE_CHOC 7
+
 
 // Ported wholesale from Apollo Station.
 
@@ -29,6 +31,8 @@
 			return list("milk", "ice", "berryjuice")
 		if(ICECREAM_BLUE)
 			return list("milk", "ice", "singulo")
+		if(ICECREAM_MATCHA)
+			return list("milk", "ice", "matcha")
 		if(CONE_WAFFLE)
 			return list("flour", "sugar")
 		if(CONE_CHOC)
@@ -44,6 +48,8 @@
 			return "strawberry"
 		if(ICECREAM_BLUE)
 			return "blue"
+		if(ICECREAM_MATCHA)
+			return "matcha"
 		if(CONE_WAFFLE)
 			return "waffle"
 		if(CONE_CHOC)
@@ -54,7 +60,7 @@
 /obj/machinery/icecream_vat/initialize()
 	. = ..()
 	create_reagents(100)
-	while(product_types.len < 6)
+	while(product_types.len < 7)
 		product_types.Add(5)
 	reagents.add_reagent("milk", 5)
 	reagents.add_reagent("flour", 5)
@@ -72,7 +78,8 @@
 	dat += "<b>Vanilla icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_VANILLA]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=5'><b>x5</b></a> [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)<br>"
 	dat += "<b>Strawberry icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_STRAWBERRY]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=5'><b>x5</b></a> [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)<br>"
 	dat += "<b>Chocolate icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_CHOCOLATE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=5'><b>x5</b></a> [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)<br>"
-	dat += "<b>Blue icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BLUE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'><b>x5</b></a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br></div>"
+	dat += "<b>Blue icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BLUE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'><b>x5</b></a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br>"
+	dat += "<b>Matcha icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_MATCHA]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_MATCHA];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_MATCHA];amount=5'><b>x5</b></a> [product_types[ICECREAM_MATCHA]] dollops left. (Ingredients: milk, ice, matcha)<br></div>"
 	dat += "<br><b>CONES</b><br><div class='statusDisplay'>"
 	dat += "<b>Waffle cones:</b> <a href='?src=\ref[src];cone=[CONE_WAFFLE]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=5'><b>x5</b></a> [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)<br>"
 	dat += "<b>Chocolate cones:</b> <a href='?src=\ref[src];cone=[CONE_CHOC]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=5'><b>x5</b></a> [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)<br></div>"
@@ -191,5 +198,6 @@
 #undef FLAVOUR_CHOCOLATE
 #undef FLAVOUR_STRAWBERRY
 #undef FLAVOUR_BLUE
+#undef FLAVOUR_MATCHA
 #undef CONE_WAFFLE
 #undef CONE_CHOC
\ No newline at end of file
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index 475a25674f..5bfdcd66af 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -218,4 +218,10 @@
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
\ No newline at end of file
+	result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
+
+/datum/recipe/tencha //TODO: Figure out how to make this recipe with a drying rack.
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/tencha
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index d0534ee42b..4d4de7b0ab 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -807,7 +807,7 @@
 	adj_sleepy = -3
 	adj_temp = 20
 
-	glass_name = "cup of tea"
+	glass_name = "tea"
 	glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
 
 	cup_icon_state = "cup_tea"
@@ -945,6 +945,22 @@
 	cup_name = "cup of watermelon tea"
 	cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!"
 
+/datum/reagent/drink/tea/matcha_latte //Putting this as tea to inherit tea variables. Should not have the same toxloss as matcha so it can be placed in a dispenser without breaking balance.
+	name = "Matcha latte"
+	id = "matcha_latte"
+	description = "A nice and tasty beverage to enjoy while studying."
+	taste_description = "creamy, vegetal sweetness"
+	color = "#b1c48c"
+	adj_temp = 5
+
+	glass_name = "matcha latte"
+	glass_desc = "A nice and refreshing beverage while you are studying."
+
+	cup_icon_state = "cup_latte"
+	cup_name = "cup of matcha latte"
+	cup_desc = "A nice and refreshing beverage while you are studying."
+
+
 /datum/reagent/drink/coffee
 	name = "Coffee"
 	id = "coffee"
@@ -1030,7 +1046,6 @@
 
 	glass_desc = "A nice and refreshing beverage while you are reading."
 	glass_name = "soy latte"
-	glass_desc = "A nice and refrshing beverage while you are reading."
 
 	cup_icon_state = "cup_latte"
 	cup_name = "cup of soy latte"
@@ -1049,11 +1064,11 @@
 	adj_temp = 5
 
 	glass_name = "cafe latte"
-	glass_desc = "A nice, strong and refreshing beverage while you are reading."
+	glass_desc = "A nice, strong, and refreshing beverage while you are reading."
 
 	cup_icon_state = "cup_latte"
 	cup_name = "cup of cafe latte"
-	cup_desc = "A nice and refreshing beverage while you are reading."
+	cup_desc = "A nice, strong, and refreshing beverage while you are reading."
 
 /datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -3295,7 +3310,7 @@
 
 	glass_name = "Sit on my face"
 	glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!"
-	
+
 /datum/reagent/ethanol/hachi
 	name = "Hachi"
 	id = "hachi"
@@ -3366,7 +3381,7 @@
 	name = "Instant green tea powder"
 	id = "instantteapowdergreen"
 	description = "Green tea powder missing all the goodness of green tea." //Heathen.
-	taste_description = "strongly bitter with a subtle chemical aftertaste"
+	taste_description = "strong bitterness with a subtle chemical aftertaste"
 	color = "#56761d"
 
 	glass_name = "tea powder"
@@ -3376,7 +3391,7 @@
 	name = "Instant green tea"
 	id = "instantteagreen"
 	description = "Convenient green tea missing all the goodness of actual green tea." //It's not even hot.
-	taste_description = "bitter with a subtle chemical aftertaste"
+	taste_description = "bitterness with a subtle chemical aftertaste"
 	color = "#cac162"
 
 	glass_name = "green tea"
@@ -3385,3 +3400,38 @@
 	cup_icon_state = "cup_tea"
 	cup_name = "cup of tea"
 	cup_desc = "Green tea. It smells a bit off."
+
+/datum/reagent/drink/matchapowder
+	name = "Matcha powder"
+	id = "matchapowder"
+	description = "Finely ground green tea. This is about the highest quality matcha you can prepare without traditional methods."
+	taste_description = "heavy bitterness"
+	color = "#86a443"
+
+	glass_name = "matcha powder"
+	glass_desc = "Matcha powder, waiting for brewing."
+
+/datum/reagent/drink/matcha
+	name = "Matcha"
+	id = "matcha"
+	description = "A form of green tea where the leaf is ground and suspended in water rather than steeped. This is considered cooking grade."
+	taste_description = "floral, full-bodied bitterness with a subtle, earthy sweetness"
+	color = "#9bc265"
+	adj_dizzy = -4
+	adj_drowsy = -1
+	adj_sleepy = -3
+	adj_temp = 20
+
+	glass_name = "matcha"
+	glass_desc = "Heavenly matcha. Good for body and spirit."
+
+	cup_icon_state = "cup_tea"
+	cup_name = "cup of matcha"
+	cup_desc = "Heavenly matcha. Good for body and spirit."
+
+/datum/reagent/drink/matcha/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	if(alien == IS_DIONA)
+		return
+	M.adjustToxLoss(-3 * removed) //Almost on par with dylovene despite being harder to obtain in bulk. Nerf if this causes problems.
+
diff --git a/code/modules/reagents/Chemistry-Recipes_ch.dm b/code/modules/reagents/Chemistry-Recipes_ch.dm
index 6ff79e224c..e8c6bff15c 100644
--- a/code/modules/reagents/Chemistry-Recipes_ch.dm
+++ b/code/modules/reagents/Chemistry-Recipes_ch.dm
@@ -47,4 +47,16 @@
 	id = "instantteagreen"
 	result = "instantteagreen"
 	required_reagents = list ("instantteapowdergreen" = 1, "water" = 9)
-	result_amount = 10
\ No newline at end of file
+	result_amount = 10
+
+/datum/chemical_reaction/matcha
+	id = "matcha"
+	result = "matcha"
+	required_reagents = list ("matchapowder" = 1, "hotwater" = 2)
+	result_amount = 2
+
+/datum/chemical_reaction/tea/matcha_latte
+	id = "matcha_latte"
+	result = "matcha_latte"
+	required_reagents = list ("matchapowder" = 1, "milk" = 5)
+	result_amount = 5
\ No newline at end of file
diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm
index a29d7ac9f8..925a2c2519 100644
--- a/code/modules/reagents/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/dispenser/cartridge_presets.dm
@@ -71,6 +71,7 @@
 	cream		spawn_reagent = "cream"
 	mint		spawn_reagent = "mint"
 	berry		spawn_reagent = "berryjuice"
+	matcha_latte	spawn_reagent = "matcha_latte"
 
 	// ERT
 	inaprov		spawn_reagent = "inaprovaline"
diff --git a/code/modules/reagents/dispenser/dispenser2_energy.dm b/code/modules/reagents/dispenser/dispenser2_energy.dm
index 4465b0b769..1038a02325 100644
--- a/code/modules/reagents/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/dispenser/dispenser2_energy.dm
@@ -58,5 +58,5 @@
 /obj/machinery/chemical_dispenser/bar_coffee
 	dispense_reagents = list(
 		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
-		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
+		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "matcha_latte"
 		)
\ No newline at end of file
diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm
index 05477d9cdd..6505eb36ab 100644
--- a/code/modules/reagents/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/dispenser/dispenser_presets.dm
@@ -137,6 +137,5 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
-
-
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte
 		)
\ No newline at end of file
diff --git a/code/modules/reagents/dispenser/supply.dm b/code/modules/reagents/dispenser/supply.dm
index e183da7f79..8f7423dc31 100644
--- a/code/modules/reagents/dispenser/supply.dm
+++ b/code/modules/reagents/dispenser/supply.dm
@@ -120,7 +120,8 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte
 		)
 	cost = 50
 	containertype = /obj/structure/closet/crate
diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm
index db27c59feb..6560f2a78a 100644
--- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm
@@ -378,7 +378,6 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/New()
 	..()
-	reagents.add_reagent("teamush", 3)
 	bitesize = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -412,6 +411,34 @@
 	reagents.add_reagent("tealeavesgreen", 6)
 	bitesize = 1
 
+/obj/item/weapon/reagent_containers/food/snacks/tencha
+	name = "Tencha"
+	desc = "A dried, crumbly green tea leaf. Needs deveined."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "tencha"
+	slice_path = /obj/item/weapon/reagent_containers/food/snacks/matchaleaf
+	slices_num = 1
+	nutriment_amt = 0
+	nutriment_desc = list("nothing" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/tencha/New()
+	..()
+	bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/matchaleaf
+	name = "Matcha"
+	desc = "Low grade matcha. Ready for grinding."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "matchaleaf"
+	nutriment_amt = 0
+	nutriment_desc = list("nothing" = 0)
+
+/obj/item/weapon/reagent_containers/food/snacks/matchaleaf/New()
+	..()
+	reagents.add_reagent("matchapowder", 5)
+	reagents.remove_reagent("teamush", 5)
+	bitesize = 1
+
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
 	name = "sobaka cube"
 	monkey_type = "Sobaka"
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index c19c0925b5..2e99504823 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ