diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm
index a8116bd6900..757be5949b0 100644
--- a/code/datums/components/transforming.dm
+++ b/code/datums/components/transforming.dm
@@ -243,7 +243,10 @@
 
 	source.hitsound = initial(source.hitsound)
 	source.update_weight_class(initial(source.w_class))
-	source.icon_state = initial(source.icon_state)
+	if(source.post_init_icon_state) // BUBBER CHANGE START : Bug Fix.
+		source.icon_state = initial(source.post_init_icon_state)
+	else
+		source.icon_state = initial(source.icon_state) // BUBBER CHANGE END
 	source.inhand_icon_state = initial(source.inhand_icon_state)
 	source.update_appearance()
 	source.update_inhand_icon()
diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm
index cc225373240..3fc178f6c4c 100644
--- a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm
+++ b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm
@@ -2,8 +2,8 @@
 
 /obj/item/umbrella
 	name = "umbrella"
-	icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi'
-	icon_state = "umbrella"
+	icon = 'icons/map_icons/items/_item.dmi'
+	icon_state = "/obj/item/umbrella"
 	post_init_icon_state = "umbrella"
 	lefthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi'
 	righthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi'
@@ -126,6 +126,7 @@
 /obj/item/umbrella/parasol
 	name = "parasol"
 	desc = "A black laced parsol, how intricate."
+	icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi'
 	icon_state = "parasol"
 	inhand_icon_state = "parasol_closed"
 	on_inhand_icon_state = "parasol_on"
diff --git a/modular_zubbers/code/modules/vending/clothesmate.dm b/modular_zubbers/code/modules/vending/clothesmate.dm
index 7adea70cc3c..b5f9f7169c0 100644
--- a/modular_zubbers/code/modules/vending/clothesmate.dm
+++ b/modular_zubbers/code/modules/vending/clothesmate.dm
@@ -226,6 +226,7 @@
 				/obj/item/riding_saddle/leather = 5,
 				/obj/item/storage/backpack/saddlebags = 5,
 				/obj/item/umbrella = 20,
+				/obj/item/umbrella/parasol = 20,
 			)
 		)
 	)