diff --git a/Content.Client/Animations/AnimationsTestComponent.cs b/Content.Client/Animations/AnimationsTestComponent.cs
index ad9a72f81a..f951295ed5 100644
--- a/Content.Client/Animations/AnimationsTestComponent.cs
+++ b/Content.Client/Animations/AnimationsTestComponent.cs
@@ -34,7 +34,7 @@ namespace Content.Client.Animations
                     },
                     new AnimationTrackComponentProperty
                     {
-                        ComponentType = typeof(ISpriteComponent),
+                        ComponentType = typeof(SpriteComponent),
                         Property = "layer/0/texture",
                         KeyFrames =
                         {
diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
index 7257c230ba..8521bb6797 100644
--- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
@@ -42,7 +42,7 @@ public sealed class CharacterInfoSystem : EntitySystem
 
     private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
     {
-        var sprite = CompOrNull<ISpriteComponent>(msg.EntityUid);
+        var sprite = CompOrNull<SpriteComponent>(msg.EntityUid);
         var data = new CharacterData(msg.JobTitle, msg.Objectives, msg.Briefing, sprite, Name(msg.EntityUid));
 
         OnCharacterUpdate?.Invoke(data);
@@ -52,7 +52,7 @@ public sealed class CharacterInfoSystem : EntitySystem
         string Job,
         Dictionary<string, List<ConditionInfo>> Objectives,
         string Briefing,
-        ISpriteComponent? Sprite,
+        SpriteComponent? Sprite,
         string EntityName
     );
 }
diff --git a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
index 89c14d00c1..37fce4e9c4 100644
--- a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
@@ -53,7 +53,7 @@ namespace Content.Client.Chemistry.Visualizers
 
             if (component.TryGetData<Color>(FoamVisuals.Color, out var color))
             {
-                if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
+                if (entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
                 {
                     sprite.Color = color;
                 }
diff --git a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
index cc77c2ce34..6b0e347a1f 100644
--- a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
@@ -18,7 +18,7 @@ namespace Content.Client.Chemistry.Visualizers
             var entities = IoCManager.Resolve<IEntityManager>();
             if (component.TryGetData<Color>(SmokeVisuals.Color, out var color))
             {
-                if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
+                if (entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
                 {
                     sprite.Color = color;
                 }
diff --git a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs b/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
index e6b0f99ad9..3b40a179b2 100644
--- a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
@@ -63,7 +63,7 @@ namespace Content.Client.Chemistry.Visualizers
 
         private void SetColor(AppearanceComponent component, Color color)
         {
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
 
             sprite.Color = color;
         }
diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
index 44734ce92f..dd5e152280 100644
--- a/Content.Client/Clickable/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -98,7 +98,7 @@ namespace Content.Client.Clickable
             return false;
         }
 
-        public bool CheckDirBound(ISpriteComponent sprite, Angle relativeRotation, Vector2 localPos)
+        public bool CheckDirBound(SpriteComponent sprite, Angle relativeRotation, Vector2 localPos)
         {
             if (Bounds == null)
                 return false;
diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
index 9ed7c150bc..701cba861c 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
@@ -85,7 +85,7 @@ namespace Content.Client.ContextMenu.UI
                 return;
             }
 
-            EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);
+            EntityIcon.Sprite = _entityManager.GetComponentOrNull<SpriteComponent>(entity);
 
             if (_adminManager.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
             {
diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
index 231f7f13db..2eb7869c5c 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
@@ -36,8 +36,8 @@ namespace Content.Client.ContextMenu.UI
                 (a, b, entMan) => entMan.GetComponent<MetaDataComponent>(a).EntityPrototype!.ID == entMan.GetComponent<MetaDataComponent>(b).EntityPrototype!.ID,
                 (a, b, entMan) =>
                 {
-                    entMan.TryGetComponent<ISpriteComponent?>(a, out var spriteA);
-                    entMan.TryGetComponent<ISpriteComponent?>(b, out var spriteB);
+                    entMan.TryGetComponent<SpriteComponent?>(a, out var spriteA);
+                    entMan.TryGetComponent<SpriteComponent?>(b, out var spriteB);
 
                     if (spriteA == null || spriteB == null)
                         return spriteA == spriteB;
@@ -54,7 +54,7 @@ namespace Content.Client.ContextMenu.UI
                 (e, entMan) =>
                 {
                     var hash = 0;
-                    foreach (var element in entMan.GetComponent<ISpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
+                    foreach (var element in entMan.GetComponent<SpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
                     {
                         hash ^= EqualityComparer<string>.Default.GetHashCode(element!);
                     }
diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
index 2d9bb9ffa1..113765b989 100644
--- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
+++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
@@ -67,7 +67,7 @@ namespace Content.Client.Disposal.Visualizers
             }
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
+            if (!entities.TryGetComponent(appearance.Owner, out SpriteComponent? sprite))
             {
                 return;
             }
diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs
index 59aa77b97a..c4214aaf64 100644
--- a/Content.Client/Doors/AirlockVisualizer.cs
+++ b/Content.Client/Doors/AirlockVisualizer.cs
@@ -152,7 +152,7 @@ namespace Content.Client.Doors
 
             base.OnChangeData(component);
 
-            var sprite = _entMan.GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = _entMan.GetComponent<SpriteComponent>(component.Owner);
             var animPlayer = _entMan.GetComponent<AnimationPlayerComponent>(component.Owner);
             if (!component.TryGetData(DoorVisuals.State, out DoorState state))
             {
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index a87dff2019..b86f2d3368 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -193,7 +193,7 @@ namespace Content.Client.Examine
 
             vBox.AddChild(hBox);
 
-            if (EntityManager.TryGetComponent(target, out ISpriteComponent? sprite))
+            if (EntityManager.TryGetComponent(target, out SpriteComponent? sprite))
             {
                 hBox.AddChild(new SpriteView
                 {
diff --git a/Content.Client/Explosion/ClusterGrenadeVisualizer.cs b/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
index 2e9ae93cae..ace76bb5de 100644
--- a/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
+++ b/Content.Client/Explosion/ClusterGrenadeVisualizer.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Explosion
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent<ISpriteComponent>(component.Owner, out var sprite))
+            if (!entities.TryGetComponent<SpriteComponent>(component.Owner, out var sprite))
             {
                 return;
             }
diff --git a/Content.Client/Hands/ShowHandItemOverlay.cs b/Content.Client/Hands/ShowHandItemOverlay.cs
index 6bd62f9379..67e7733625 100644
--- a/Content.Client/Hands/ShowHandItemOverlay.cs
+++ b/Content.Client/Hands/ShowHandItemOverlay.cs
@@ -60,7 +60,7 @@ namespace Content.Client.Hands
 
             var handEntity = EntityOverride ?? EntitySystem.Get<HandsSystem>().GetActiveHandEntity();
 
-            if (handEntity == null || !_entMan.HasComponent<ISpriteComponent>(handEntity))
+            if (handEntity == null || !_entMan.HasComponent<SpriteComponent>(handEntity))
                 return;
 
             var halfSize = _renderBackbuffer.Size / 2;
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 6e500cfc69..799f6cf835 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -101,7 +101,7 @@ namespace Content.Client.Inventory
             UpdateSlot(args.Equipee, component, args.Slot);
             if (args.Equipee != _playerManager.LocalPlayer?.ControlledEntity)
                 return;
-            var sprite = EntityManager.GetComponentOrNull<ISpriteComponent>(args.Equipment);
+            var sprite = EntityManager.GetComponentOrNull<SpriteComponent>(args.Equipment);
             var update = new SlotSpriteUpdate(args.SlotGroup, args.Slot, sprite,
                 HasComp<ClientStorageComponent>(args.Equipment));
             OnSpriteUpdate?.Invoke(update);
@@ -340,7 +340,7 @@ namespace Content.Client.Inventory
         public readonly record struct SlotSpriteUpdate(
             string Group,
             string Name,
-            ISpriteComponent? Sprite,
+            SpriteComponent? Sprite,
             bool ShowStorage
         );
     }
diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs
index 0b2a694440..6f03a76b16 100644
--- a/Content.Client/Jittering/JitteringSystem.cs
+++ b/Content.Client/Jittering/JitteringSystem.cs
@@ -29,7 +29,7 @@ namespace Content.Client.Jittering
 
         private void OnStartup(EntityUid uid, JitteringComponent jittering, ComponentStartup args)
         {
-            if (!EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
+            if (!EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
                 return;
 
             var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
@@ -52,11 +52,11 @@ namespace Content.Client.Jittering
                 return;
 
             if(EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer)
-            && EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
+            && EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
                 animationPlayer.Play(GetAnimation(jittering, sprite), _jitterAnimationKey);
         }
 
-        private Animation GetAnimation(JitteringComponent jittering, ISpriteComponent sprite)
+        private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
         {
             var amplitude = MathF.Min(4f, jittering.Amplitude / 100f + 1f) / 10f;
             var offset = new Vector2(_random.NextFloat(amplitude/4f, amplitude),
@@ -88,8 +88,8 @@ namespace Content.Client.Jittering
                 {
                     new AnimationTrackComponentProperty()
                     {
-                        ComponentType = typeof(ISpriteComponent),
-                        Property = nameof(ISpriteComponent.Offset),
+                        ComponentType = typeof(SpriteComponent),
+                        Property = nameof(SpriteComponent.Offset),
                         KeyFrames =
                         {
                             new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),
diff --git a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
index 04d3e178fc..77d54159c1 100644
--- a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
@@ -9,7 +9,7 @@ namespace Content.Client.Kitchen.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
             component.TryGetData(ReagentGrinderVisualState.BeakerAttached, out bool hasBeaker);
             sprite.LayerSetState(0, $"juicer{(hasBeaker ? "1" : "0")}");
         }
diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
index 2b91408057..cc40dd27be 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
@@ -25,7 +25,7 @@ namespace Content.Client.Light.Visualizers
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
             if (!component.TryGetData(PoweredLightVisuals.BulbState, out PoweredLightState state)) return;
 
             switch (state)
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index f6aaf08a63..ee609feb93 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -94,7 +94,7 @@ namespace Content.Client.Lobby.UI
         {
             return new()
             {
-                Sprite = _entityManager.GetComponent<ISpriteComponent>(entity),
+                Sprite = _entityManager.GetComponent<SpriteComponent>(entity),
                 OverrideDirection = direction,
                 Scale = (2, 2)
             };
diff --git a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
index 87601d45ce..db35447c26 100644
--- a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
+++ b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
@@ -16,7 +16,7 @@ namespace Content.Client.MedicalScanner
         {
             base.OnChangeData(component);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
             if (!component.TryGetData(MedicalScannerVisuals.Status, out MedicalScannerStatus status)) return;
             sprite.LayerSetState(MedicalScannerVisualLayers.Machine, StatusToMachineStateId(status));
             sprite.LayerSetState(MedicalScannerVisualLayers.Terminal, StatusToTerminalStateId(status));
diff --git a/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
index 2bf06ec6a0..692601a214 100644
--- a/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
+++ b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
@@ -18,7 +18,7 @@ namespace Content.Client.Nutrition.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
 
             sprite.LayerMapReserveBlank(CreamPiedVisualLayers.Pie);
             sprite.LayerSetRSI(CreamPiedVisualLayers.Pie, "Effects/creampie.rsi");
@@ -38,7 +38,7 @@ namespace Content.Client.Nutrition.Visualizers
 
         private void SetPied(AppearanceComponent component, bool pied)
         {
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
 
             sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, pied);
             sprite.LayerSetState(CreamPiedVisualLayers.Pie, _state);
diff --git a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs b/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
index 285140e0a1..6cc58204ef 100644
--- a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
+++ b/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
@@ -22,7 +22,7 @@ namespace Content.Client.Nutrition.Visualizers
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
             {
                 return;
             }
diff --git a/Content.Client/Orbit/OrbitVisualsSystem.cs b/Content.Client/Orbit/OrbitVisualsSystem.cs
index 1c6501c9bc..8656597918 100644
--- a/Content.Client/Orbit/OrbitVisualsSystem.cs
+++ b/Content.Client/Orbit/OrbitVisualsSystem.cs
@@ -71,7 +71,7 @@ public sealed class OrbitVisualsSystem : EntitySystem
     {
         base.FrameUpdate(frameTime);
 
-        foreach (var (orbit, sprite) in EntityManager.EntityQuery<OrbitVisualsComponent, ISpriteComponent>())
+        foreach (var (orbit, sprite) in EntityManager.EntityQuery<OrbitVisualsComponent, SpriteComponent>())
         {
             var angle = new Angle(Math.PI * 2 * orbit.Orbit);
             var vec = angle.RotateVec(new Vector2(orbit.OrbitDistance, 0));
@@ -114,7 +114,7 @@ public sealed class OrbitVisualsSystem : EntitySystem
         };
     }
 
-    private Animation GetStopAnimation(OrbitVisualsComponent component, ISpriteComponent sprite)
+    private Animation GetStopAnimation(OrbitVisualsComponent component, SpriteComponent sprite)
     {
         var length = component.OrbitStopLength;
 
@@ -125,8 +125,8 @@ public sealed class OrbitVisualsSystem : EntitySystem
             {
                 new AnimationTrackComponentProperty()
                 {
-                    ComponentType = typeof(ISpriteComponent),
-                    Property = nameof(ISpriteComponent.Offset),
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
                     KeyFrames =
                     {
                         new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),
@@ -136,8 +136,8 @@ public sealed class OrbitVisualsSystem : EntitySystem
                 },
                 new AnimationTrackComponentProperty()
                 {
-                    ComponentType = typeof(ISpriteComponent),
-                    Property = nameof(ISpriteComponent.Rotation),
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
                     KeyFrames =
                     {
                         new AnimationTrackProperty.KeyFrame(sprite.Rotation.Reduced(), 0f),
diff --git a/Content.Client/PDA/PDAVisualizer.cs b/Content.Client/PDA/PDAVisualizer.cs
index 7f8ca7a5e3..84a0f994f5 100644
--- a/Content.Client/PDA/PDAVisualizer.cs
+++ b/Content.Client/PDA/PDAVisualizer.cs
@@ -30,7 +30,7 @@ namespace Content.Client.PDA
         {
             base.InitializeEntity(entity);
             var entityManager = IoCManager.Resolve<IEntityManager>();
-            var sprite = entityManager.GetComponent<ISpriteComponent>(entity);
+            var sprite = entityManager.GetComponent<SpriteComponent>(entity);
 
             if (_state != null)
             {
@@ -50,7 +50,7 @@ namespace Content.Client.PDA
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
             sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false);
             if (component.TryGetData(UnpoweredFlashlightVisuals.LightOn, out bool isFlashlightOn))
             {
diff --git a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
index d62c7c05c5..e34f8e5550 100644
--- a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
+++ b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
@@ -25,7 +25,7 @@ namespace Content.Client.ParticleAccelerator
         public override void InitializeEntity(EntityUid entity)
         {
             base.InitializeEntity(entity);
-            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(entity, out var sprite))
+            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(entity, out var sprite))
             {
                 throw new EntityCreationException("No sprite component found in entity that has ParticleAcceleratorPartVisualizer");
             }
@@ -42,7 +42,7 @@ namespace Content.Client.ParticleAccelerator
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
             if (!component.TryGetData(ParticleAcceleratorVisuals.VisualState, out ParticleAcceleratorVisualState state))
             {
                 state = ParticleAcceleratorVisualState.Unpowered;
diff --git a/Content.Client/Power/APC/ApcVisualizer.cs b/Content.Client/Power/APC/ApcVisualizer.cs
index 8936fa7a24..a7fee79461 100644
--- a/Content.Client/Power/APC/ApcVisualizer.cs
+++ b/Content.Client/Power/APC/ApcVisualizer.cs
@@ -21,7 +21,7 @@ namespace Content.Client.Power.APC
         {
             base.InitializeEntity(entity);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
 
             sprite.LayerMapSet(Layers.Panel, sprite.AddLayerState("apc0"));
 
@@ -47,7 +47,7 @@ namespace Content.Client.Power.APC
             base.OnChangeData(component);
 
             var ent = IoCManager.Resolve<IEntityManager>();
-            var sprite = ent.GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = ent.GetComponent<SpriteComponent>(component.Owner);
             if (component.TryGetData<ApcPanelState>(ApcVisuals.PanelState, out var panelState))
             {
                 switch (panelState)
diff --git a/Content.Client/Power/SMES/SmesVisualizer.cs b/Content.Client/Power/SMES/SmesVisualizer.cs
index 67b8abc571..7682671002 100644
--- a/Content.Client/Power/SMES/SmesVisualizer.cs
+++ b/Content.Client/Power/SMES/SmesVisualizer.cs
@@ -15,7 +15,7 @@ namespace Content.Client.Power.SMES
         {
             base.InitializeEntity(entity);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
 
             sprite.LayerMapSet(Layers.Input, sprite.AddLayerState("smes-oc0"));
             sprite.LayerSetShader(Layers.Input, "unshaded");
@@ -31,7 +31,7 @@ namespace Content.Client.Power.SMES
         {
             base.OnChangeData(component);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
             if (!component.TryGetData<int>(SmesVisuals.LastChargeLevel, out var level) || level == 0)
             {
                 sprite.LayerSetVisible(Layers.Charge, false);
diff --git a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
index 30542deb65..ed2c27684d 100644
--- a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
+++ b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Power
         {
             base.OnChangeData(component);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
             var powered = component.TryGetData(PowerDeviceVisuals.Powered, out bool poweredVar) && poweredVar;
             sprite.LayerSetVisible(PowerDeviceVisualLayers.Powered, powered);
         }
diff --git a/Content.Client/PowerCell/PowerChargerVisualizer.cs b/Content.Client/PowerCell/PowerChargerVisualizer.cs
index 31c97a4fcf..42791ed39e 100644
--- a/Content.Client/PowerCell/PowerChargerVisualizer.cs
+++ b/Content.Client/PowerCell/PowerChargerVisualizer.cs
@@ -14,7 +14,7 @@ namespace Content.Client.PowerCell
         {
             base.InitializeEntity(entity);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
 
             // Base item
             sprite.LayerMapSet(Layers.Base, sprite.AddLayerState("empty"));
@@ -29,7 +29,7 @@ namespace Content.Client.PowerCell
         {
             base.OnChangeData(component);
 
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
 
             // Update base item
             if (component.TryGetData(CellVisual.Occupied, out bool occupied))
diff --git a/Content.Client/Recycling/RecyclerVisualizer.cs b/Content.Client/Recycling/RecyclerVisualizer.cs
index 75f1c1c0e3..856ebffc5e 100644
--- a/Content.Client/Recycling/RecyclerVisualizer.cs
+++ b/Content.Client/Recycling/RecyclerVisualizer.cs
@@ -23,7 +23,7 @@ namespace Content.Client.Recycling
             base.InitializeEntity(entity);
 
             var entMan = IoCManager.Resolve<IEntityManager>();
-            if (!entMan.TryGetComponent(entity, out ISpriteComponent? sprite) ||
+            if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite) ||
                 !entMan.TryGetComponent(entity, out AppearanceComponent? appearance))
             {
                 return;
@@ -38,7 +38,7 @@ namespace Content.Client.Recycling
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
             {
                 return;
             }
@@ -46,7 +46,7 @@ namespace Content.Client.Recycling
             UpdateAppearance(component, sprite);
         }
 
-        private void UpdateAppearance(AppearanceComponent component, ISpriteComponent sprite)
+        private void UpdateAppearance(AppearanceComponent component, SpriteComponent sprite)
         {
             var state = _stateOff;
             if (component.TryGetData(ConveyorVisuals.State, out ConveyorState conveyorState) && conveyorState != ConveyorState.Off)
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index a309e1afa7..a80c6ba9aa 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -54,8 +54,8 @@ public sealed class RotationVisualizerSystem : VisualizerSystem<RotationVisualsC
             {
                 new AnimationTrackComponentProperty
                 {
-                    ComponentType = typeof(ISpriteComponent),
-                    Property = nameof(ISpriteComponent.Rotation),
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
                     InterpolationMode = AnimationInterpolationMode.Linear,
                     KeyFrames =
                     {
diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index fd900fa4bd..697a30dc40 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -120,7 +120,7 @@ namespace Content.Client.RoundEnd
                     VerticalExpand = true,
                 };
 
-                if (_entityManager.TryGetComponent(playerInfo.PlayerEntityUid, out ISpriteComponent? sprite))
+                if (_entityManager.TryGetComponent(playerInfo.PlayerEntityUid, out SpriteComponent? sprite))
                 {
                     hBox.AddChild(new SpriteView
                     {
diff --git a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
index 7410cff722..a801910906 100644
--- a/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
@@ -56,7 +56,7 @@ namespace Content.Client.Singularity.Visualizers
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
             if (!entities.TryGetComponent(component.Owner, out AnimationPlayerComponent? animPlayer)) return;
             if (!component.TryGetData(RadiationCollectorVisuals.VisualState, out RadiationCollectorVisualState state))
             {
diff --git a/Content.Client/Stack/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs
index 2bf1149136..ae1c96f261 100644
--- a/Content.Client/Stack/StackVisualizer.cs
+++ b/Content.Client/Stack/StackVisualizer.cs
@@ -85,7 +85,7 @@ namespace Content.Client.Stack
 
             if (_isComposite
                 && _spriteLayers.Count > 0
-                && IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(entity, out var spriteComponent))
+                && IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(entity, out var spriteComponent))
             {
                 var spritePath = _spritePath ?? spriteComponent.BaseRSI!.Path!;
 
@@ -104,7 +104,7 @@ namespace Content.Client.Stack
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (entities.TryGetComponent(component.Owner, out ISpriteComponent? spriteComponent))
+            if (entities.TryGetComponent(component.Owner, out SpriteComponent? spriteComponent))
             {
                 if (_isComposite)
                 {
@@ -117,7 +117,7 @@ namespace Content.Client.Stack
             }
         }
 
-        private void ProcessOpaqueSprites(AppearanceComponent component, ISpriteComponent spriteComponent)
+        private void ProcessOpaqueSprites(AppearanceComponent component, SpriteComponent spriteComponent)
         {
             // Skip processing if no actual
             if (!component.TryGetData<int>(StackVisuals.Actual, out var actual)) return;
@@ -130,7 +130,7 @@ namespace Content.Client.Stack
             spriteComponent.LayerSetState(IconLayer, _spriteLayers[activeLayer]);
         }
 
-        private void ProcessCompositeSprites(AppearanceComponent component, ISpriteComponent spriteComponent)
+        private void ProcessCompositeSprites(AppearanceComponent component, SpriteComponent spriteComponent)
         {
             // If hidden, don't render any sprites
             if (component.TryGetData<bool>(StackVisuals.Hide, out var hide)
diff --git a/Content.Client/Storage/UI/StorageWindow.cs b/Content.Client/Storage/UI/StorageWindow.cs
index ebda2ebed8..11d5b64da3 100644
--- a/Content.Client/Storage/UI/StorageWindow.cs
+++ b/Content.Client/Storage/UI/StorageWindow.cs
@@ -110,7 +110,7 @@ namespace Content.Client.Storage.UI
                 || !_entityManager.EntityExists(entity))
                 return;
 
-            _entityManager.TryGetComponent(entity, out ISpriteComponent? sprite);
+            _entityManager.TryGetComponent(entity, out SpriteComponent? sprite);
             _entityManager.TryGetComponent(entity, out ItemComponent? item);
 
             button.AddChild(new BoxContainer
diff --git a/Content.Client/Storage/Visualizers/StorageVisualizer.cs b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
index c6b2f455df..44fe3526bb 100644
--- a/Content.Client/Storage/Visualizers/StorageVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
@@ -25,7 +25,7 @@ namespace Content.Client.Storage.Visualizers
         [Obsolete("Subscribe to your component being initialised instead.")]
         public override void InitializeEntity(EntityUid entity)
         {
-            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
+            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SpriteComponent? sprite))
             {
                 return;
             }
@@ -47,7 +47,7 @@ namespace Content.Client.Storage.Visualizers
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
             {
                 return;
             }
diff --git a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs b/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
index 6dd8de5f09..0a705a8863 100644
--- a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
+++ b/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Tabletop.Visualizers
         public override void OnChangeData(AppearanceComponent appearance)
         {
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent<ISpriteComponent>(appearance.Owner, out var sprite))
+            if (!entities.TryGetComponent<SpriteComponent>(appearance.Owner, out var sprite))
             {
                 return;
             }
diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs
index 6686e035bf..ff3cd9593d 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizer.cs
+++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs
@@ -45,7 +45,7 @@ namespace Content.Client.Trigger
         public override void OnChangeData(AppearanceComponent component)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
-            var sprite = entMan.GetComponent<ISpriteComponent>(component.Owner);
+            var sprite = entMan.GetComponent<SpriteComponent>(component.Owner);
             var animPlayer = entMan.GetComponent<AnimationPlayerComponent>(component.Owner);
             if (!component.TryGetData(TriggerVisuals.VisualState, out TriggerVisualState state))
             {
diff --git a/Content.Client/Verbs/UI/VerbMenuElement.cs b/Content.Client/Verbs/UI/VerbMenuElement.cs
index 5fc6f81b05..57c532a9ff 100644
--- a/Content.Client/Verbs/UI/VerbMenuElement.cs
+++ b/Content.Client/Verbs/UI/VerbMenuElement.cs
@@ -48,7 +48,7 @@ namespace Content.Client.Verbs.UI
                 var spriteView = new SpriteView()
                 {
                     OverrideDirection = Direction.South,
-                    Sprite = entManager.GetComponentOrNull<ISpriteComponent>(verb.IconEntity.Value)
+                    Sprite = entManager.GetComponentOrNull<SpriteComponent>(verb.IconEntity.Value)
                 };
 
                 Icon.AddChild(spriteView);
diff --git a/Content.Client/Visualizer/GenericEnumVisualizer.cs b/Content.Client/Visualizer/GenericEnumVisualizer.cs
index d7f2c076ab..df2bcf86dd 100644
--- a/Content.Client/Visualizer/GenericEnumVisualizer.cs
+++ b/Content.Client/Visualizer/GenericEnumVisualizer.cs
@@ -57,7 +57,7 @@ namespace Content.Client.Visualizer
             base.OnChangeData(component);
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
+            if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
             if (!component.TryGetData(Key, out object status)) return;
             if (!States.TryGetValue(status, out var val)) return;
             sprite.LayerSetState(Layer, val);
diff --git a/Content.Client/Wall/ReinforcedWallVisualizer.cs b/Content.Client/Wall/ReinforcedWallVisualizer.cs
index fb2536dcc9..37c4419399 100644
--- a/Content.Client/Wall/ReinforcedWallVisualizer.cs
+++ b/Content.Client/Wall/ReinforcedWallVisualizer.cs
@@ -25,7 +25,7 @@ namespace Content.Client.Wall
             var entity = component.Owner;
 
             var entities = IoCManager.Resolve<IEntityManager>();
-            if (!entities.TryGetComponent(entity, out ISpriteComponent? sprite)) return;
+            if (!entities.TryGetComponent(entity, out SpriteComponent? sprite)) return;
 
             var index = sprite.LayerMapReserveBlank(ReinforcedWallVisualLayers.Deconstruction);