diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
index 60f2305a8c3..3e5639a5217 100644
--- a/ATTRIBUTIONS.md
+++ b/ATTRIBUTIONS.md
@@ -73,3 +73,10 @@
 **Creator:** Poojawa (https://github.com/VOREStation/VOREStation/pull/6052)<br>
 **License:** [General License](sound/vore/sunesound/LICENSE.txt)<br>
 **Notes:** Permission to use assets also given in writing. All files under this folder is NOT licensed under CC3. Seek separate permission before copying/using.<br>
+<br>
+**File:** `icons/rogue-star/loafs_64x32.dmi`and `icons/rogue-star/tails_64x32_rs.dmi`<br>
+**Title:** Rogue Star Tails<br>
+**Icon-States:** `flagtail`, derivs by VerySoft, `bnytr`, derivs by Verysoft, `chonksqrl`, derivs by Verysoft<br>
+**Creator:** VerySoft (https://github.com/TS-Rogue-Star/Rogue-Star/pull/435)<br>
+**URL:** [Website](https://rogue-star.net/)<br>
+**License:** Permission granting in writing for use by Virgo and Chomp with proper attribution
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index c27553b787b..ae5008e27e6 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1356,7 +1356,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 		if(tail_style.extra_overlay)
 			var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay) //CHOMPEdit
 			if(wagging && tail_style.ani_state)
-				overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay_w)
+				overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay_w)	//RS EDIT
 				overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode)
 				tail_s.Blend(overlay, ICON_OVERLAY)
 				qdel(overlay)
@@ -1368,7 +1368,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 		if(tail_style.extra_overlay2)
 			var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2) //CHOMPEdit
 			if(wagging && tail_style.ani_state)
-				overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2_w)
+				overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2_w)	//RS EDIT
 				overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode)
 				tail_s.Blend(overlay, ICON_OVERLAY)
 				qdel(overlay)
diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
index 963eed182ab..e38e7a501db 100644
--- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
@@ -1532,3 +1532,21 @@
 	extra_overlay2 = "kaiju_long_a_spikes_glow"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
+
+//RS ADD START
+
+/datum/sprite_accessory/tail/longtail/flagtail
+	name = "Flagtail"
+	icon = 'icons/rogue-star/tails_64x32_rs.dmi'
+	icon_state = "flagtail"
+	extra_overlay = "flagtail-1"
+	extra_overlay2 = "flagtail-2"
+
+/datum/sprite_accessory/tail/longtail/chonksqrl
+	name = "Squirrel (Big)"
+	icon = 'icons/rogue-star/tails_64x32_rs.dmi'
+	icon_state = "chonksqrl"
+	extra_overlay = "chonksqrl-m1"
+	extra_overlay2 = "chonksqrl-m2"
+
+//RS ADD END
\ No newline at end of file
diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
index 44064c6a0d8..0d9e9a1539f 100644
--- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
@@ -1119,3 +1119,22 @@
 	offset_y = -11
 	mob_offset_y = 11
 */
+
+//RS ADD START
+
+
+/datum/sprite_accessory/tail/taur/bunny
+	name = "Bunny (Taur, Fat vwag)"
+	icon = 'icons/rogue-star/tails_64x32_rs.dmi'
+	icon_state = "bnytr"
+	extra_overlay = "bnytr-m1"
+	extra_overlay2 = "bnytr-m2"
+	ani_state = "bnytr-f"
+	extra_overlay_w = "bnytr-m1"
+	extra_overlay2_w = "bnytr-f-m2"
+
+	can_loaf = TRUE
+	icon_loaf = 'icons/rogue-star/loafs_64x32.dmi'
+	loaf_offset = 4
+
+//RS ADD END
\ No newline at end of file
diff --git a/icons/rogue-star/loafs_64x32.dmi b/icons/rogue-star/loafs_64x32.dmi
new file mode 100644
index 00000000000..23ee1451944
Binary files /dev/null and b/icons/rogue-star/loafs_64x32.dmi differ
diff --git a/icons/rogue-star/tails_64x32_rs.dmi b/icons/rogue-star/tails_64x32_rs.dmi
new file mode 100644
index 00000000000..72dac326eec
Binary files /dev/null and b/icons/rogue-star/tails_64x32_rs.dmi differ