diff --git a/versions/1.21.8/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/versions/1.21.8/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
index 0363dad..5a22bbb 100644
--- a/versions/1.21.8/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
+++ b/versions/1.21.8/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
@@ -1,14 +1,21 @@
 package org.saturnclient.saturnclient.mixin;
 
+import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 
+import org.saturnclient.client.player.Roles;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.impl.cosmetics.CloakFeatureRenderer;
 import org.saturnclient.impl.cosmetics.HatFeatureRenderer;
+import org.saturnclient.saturnclient.SaturnRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -27,4 +34,27 @@ public abstract class PlayerEntityRendererMixin
         this.addFeature(new HatFeatureRenderer(this));
         this.addFeature(new CloakFeatureRenderer(this, ctx.getEquipmentModelLoader()));
     }
+
+    @Inject(method = "updateRenderState", at = @At("TAIL"))
+    public void updateRenderState(
+            AbstractClientPlayerEntity entity, PlayerEntityRenderState state,
+            float f, CallbackInfo ci) {
+        if (entity == null) {
+            return;
+        }
+
+        SaturnPlayer player = SaturnPlayer.get(entity.getUuid());
+
+        state.setData(SaturnRenderState.saturnDataKey, player);
+
+        if (player != null) {
+            MutableText iconText = Text.literal(Roles.getSaturnIndicator())
+                    .styled(style -> style.withColor(Roles.getIconColor(player.uuid)));
+
+            state.displayName = Text.empty()
+                    .append(iconText.copy())
+                    .append(Text.empty().formatted(Formatting.RESET))
+                    .append(state.displayName.copy());
+        }
+    }
 }
\ No newline at end of file
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
index 9bf40dd..6da5ccb 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
@@ -22,8 +22,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.kitfox.svg.A;
-
 @Mixin(PlayerEntityRenderer.class)
 public abstract class PlayerEntityRendererMixin
         extends LivingEntityRenderer<PlayerEntity, PlayerEntityRenderState, PlayerEntityModel> {