diff --git a/src/main/scala/ocelot/desktop/node/Node.scala b/src/main/scala/ocelot/desktop/node/Node.scala
index f3da92e..1734cce 100644
--- a/src/main/scala/ocelot/desktop/node/Node.scala
+++ b/src/main/scala/ocelot/desktop/node/Node.scala
@@ -119,7 +119,7 @@ abstract class Node extends Widget with MouseHandler with HoverHandler with Pers
     super.dispose()
   }
 
-  def iconSource: IconSource = IconSource.Icons.NA
+  def icon: IconSource = IconSource.Icons.NA
 
   def iconColor: Color = RGBAColor(255, 255, 255)
 
@@ -263,7 +263,7 @@ abstract class Node extends Widget with MouseHandler with HoverHandler with Pers
     drawHighlight(g)
 
     g.sprite(
-      iconSource,
+      icon,
       position.x + HighlightThickness,
       position.y + HighlightThickness,
       size.width - HighlightThickness * 2,
diff --git a/src/main/scala/ocelot/desktop/node/nodes/CableNode.scala b/src/main/scala/ocelot/desktop/node/nodes/CableNode.scala
index 4f59e24..f3c8e34 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/CableNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/CableNode.scala
@@ -6,7 +6,7 @@ import ocelot.desktop.node.EntityNode
 import totoro.ocelot.brain.entity.Cable
 
 class CableNode(val cable: Cable) extends EntityNode(cable) {
-  override def iconSource: IconSource = IconSource.Nodes.Cable
+  override def icon: IconSource = IconSource.Nodes.Cable
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala b/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
index a4d95f3..8ef7562 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/CameraNode.scala
@@ -6,7 +6,7 @@ import ocelot.desktop.node.{EntityNode, LabeledEntityNode, WindowedNode}
 import ocelot.desktop.windows.CameraWindow
 
 class CameraNode(val camera: Camera) extends EntityNode(camera) with LabeledEntityNode with WindowedNode[CameraWindow] {
-  override def iconSource: IconSource = IconSource.Nodes.Camera
+  override def icon: IconSource = IconSource.Nodes.Camera
 
   override def rotatable: Boolean = true
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/ChestNode.scala b/src/main/scala/ocelot/desktop/node/nodes/ChestNode.scala
index 59e5e33..6ccaba3 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/ChestNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/ChestNode.scala
@@ -10,7 +10,7 @@ import ocelot.desktop.windows.ChestWindow
 class ChestNode extends LabeledNode with WindowedNode[ChestWindow] with PersistedInventory {
   override type I = Item with PersistableItem
 
-  override def iconSource: IconSource = IconSource.Nodes.Chest
+  override def icon: IconSource = IconSource.Nodes.Chest
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/ComputerNode.scala b/src/main/scala/ocelot/desktop/node/nodes/ComputerNode.scala
index 3ee9500..b6b64ed 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/ComputerNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/ComputerNode.scala
@@ -20,7 +20,7 @@ class ComputerNode(val computerCase: Case)
     with AudibleComputerAware
     with WindowedNode[ComputerWindow] {
 
-  override val iconSource: IconSource = IconSource.Nodes.Computer.Default
+  override val icon: IconSource = IconSource.Nodes.Computer.Default
   override def iconColor: Color = TierColor.get(computerCase.tier)
 
   override def rotatable: Boolean = true
diff --git a/src/main/scala/ocelot/desktop/node/nodes/DiskDriveNode.scala b/src/main/scala/ocelot/desktop/node/nodes/DiskDriveNode.scala
index 2025a41..2f629cf 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/DiskDriveNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/DiskDriveNode.scala
@@ -21,7 +21,7 @@ class DiskDriveNode(entity: FloppyDiskDrive)
     with ShiftClickNode
     with WindowedNode[DiskDriveWindow] {
 
-  override def iconSource: IconSource = IconSource.Nodes.DiskDrive.Default
+  override def icon: IconSource = IconSource.Nodes.DiskDrive.Default
 
   override def rotatable: Boolean = true
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/HologramProjectorNode.scala b/src/main/scala/ocelot/desktop/node/nodes/HologramProjectorNode.scala
index 23b7d36..9a61ff7 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/HologramProjectorNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/HologramProjectorNode.scala
@@ -8,7 +8,7 @@ import totoro.ocelot.brain.entity.HologramProjector
 class HologramProjectorNode(val hologramProjector: HologramProjector)
     extends EntityNode(hologramProjector) with LabeledEntityNode with WindowedNode[HologramProjectorWindow] {
 
-  override def iconSource: IconSource = IconSource.Nodes.HologramProjector(hologramProjector.tier)
+  override def icon: IconSource = IconSource.Nodes.HologramProjector(hologramProjector.tier)
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/IronNoteBlockNode.scala b/src/main/scala/ocelot/desktop/node/nodes/IronNoteBlockNode.scala
index 13f7f91..2d4999e 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/IronNoteBlockNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/IronNoteBlockNode.scala
@@ -9,7 +9,7 @@ import totoro.ocelot.brain.event.{EventBus, NoteBlockTriggerEvent}
 import scala.util.Random
 
 class IronNoteBlockNode(val ironNoteBlock: IronNoteBlock) extends NoteBlockNodeBase(ironNoteBlock) {
-  override def iconSource: IconSource = IconSource.Nodes.IronNoteBlock
+  override def icon: IconSource = IconSource.Nodes.IronNoteBlock
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/MicrocontrollerNode.scala b/src/main/scala/ocelot/desktop/node/nodes/MicrocontrollerNode.scala
index 5dc62f9..b12368a 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/MicrocontrollerNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/MicrocontrollerNode.scala
@@ -21,7 +21,7 @@ class MicrocontrollerNode(val microcontroller: Microcontroller)
     with DefaultSlotItemsFillable
     with WindowedNode[ComputerWindow] {
 
-  override val iconSource: IconSource = IconSource.Nodes.Microcontroller.Default
+  override val icon: IconSource = IconSource.Nodes.Microcontroller.Default
 
   override def setupContextMenu(menu: ContextMenu, event: ClickEvent): Unit = {
     addPowerContextMenuEntries(menu)
diff --git a/src/main/scala/ocelot/desktop/node/nodes/NoteBlockNode.scala b/src/main/scala/ocelot/desktop/node/nodes/NoteBlockNode.scala
index 5f9d676..aef4aa6 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/NoteBlockNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/NoteBlockNode.scala
@@ -7,7 +7,7 @@ import totoro.ocelot.brain.entity.NoteBlock
 import totoro.ocelot.brain.event.{EventBus, NoteBlockTriggerEvent}
 
 class NoteBlockNode(val noteBlock: NoteBlock) extends NoteBlockNodeBase(noteBlock) {
-  override def iconSource: IconSource = IconSource.Nodes.NoteBlock
+  override def icon: IconSource = IconSource.Nodes.NoteBlock
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/OcelotBlockNode.scala b/src/main/scala/ocelot/desktop/node/nodes/OcelotBlockNode.scala
index 49fd13e..3d07fb0 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/OcelotBlockNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/OcelotBlockNode.scala
@@ -22,7 +22,7 @@ class OcelotBlockNode(val ocelot: OcelotBlock)
 
   override def name: String = "Ocelot Block"
 
-  override def iconSource: IconSource = IconSource.Nodes.OcelotBlock.Default
+  override def icon: IconSource = IconSource.Nodes.OcelotBlock.Default
 
   override def rotatable: Boolean = false
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/OpenFMRadioNode.scala b/src/main/scala/ocelot/desktop/node/nodes/OpenFMRadioNode.scala
index f4f3960..53b031b 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/OpenFMRadioNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/OpenFMRadioNode.scala
@@ -9,7 +9,7 @@ import ocelot.desktop.windows.OpenFMRadioWindow
 
 class OpenFMRadioNode(val openFMRadio: OpenFMRadio)
     extends EntityNode(openFMRadio) with LabeledEntityNode with WindowedNode[OpenFMRadioWindow] {
-  override def iconSource: IconSource = IconSource.Nodes.OpenFMRadio
+  override def icon: IconSource = IconSource.Nodes.OpenFMRadio
 
   override def rotatable: Boolean = true
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/RackNode.scala b/src/main/scala/ocelot/desktop/node/nodes/RackNode.scala
index 19b8722..b332f3e 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/RackNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/RackNode.scala
@@ -18,7 +18,7 @@ import totoro.ocelot.brain.network
 import totoro.ocelot.brain.util.Direction
 
 class RackNode(val rack: Rack) extends ComputerAwareNode(rack) with WindowedNode[RackWindow] {
-  override val iconSource: IconSource = IconSource.Nodes.Rack.Empty
+  override val icon: IconSource = IconSource.Nodes.Rack.Empty
   override def exposeAddress = false
 
   override def ports: Array[NodePort] = Array(
diff --git a/src/main/scala/ocelot/desktop/node/nodes/RaidNode.scala b/src/main/scala/ocelot/desktop/node/nodes/RaidNode.scala
index 97a82b6..23c56f1 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/RaidNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/RaidNode.scala
@@ -27,7 +27,7 @@ class RaidNode(val raid: Raid)
     with WindowedNode[RaidWindow] {
   var diskSlots: Array[HddSlotWidget] = Array.tabulate(3)(index => new HddSlotWidget(Slot(index), Tier.Three))
 
-  override val iconSource: IconSource = IconSource.Nodes.Raid.Default
+  override val icon: IconSource = IconSource.Nodes.Raid.Default
 
   override def rotatable: Boolean = true
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/RelayNode.scala b/src/main/scala/ocelot/desktop/node/nodes/RelayNode.scala
index b4440a2..36ecf84 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/RelayNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/RelayNode.scala
@@ -11,7 +11,7 @@ import totoro.ocelot.brain.util.Direction
 class RelayNode(val relay: Relay)
     extends EntityNode(relay) with SyncedInventory with LabeledNode with WindowedNode[RelayWindow] {
 
-  override val iconSource: IconSource = IconSource.Nodes.Relay
+  override val icon: IconSource = IconSource.Nodes.Relay
 
   override def ports: Array[NodePort] = Array(
     NodePort(Some(Direction.North)),
diff --git a/src/main/scala/ocelot/desktop/node/nodes/ScreenNode.scala b/src/main/scala/ocelot/desktop/node/nodes/ScreenNode.scala
index b4f2065..9bfb6c1 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/ScreenNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/ScreenNode.scala
@@ -91,7 +91,7 @@ class ScreenNode(val screen: Screen)
     }
   }
 
-  override def iconSource: IconSource = IconSource.Nodes.Screen.Standalone
+  override def icon: IconSource = IconSource.Nodes.Screen.Standalone
 
   override def iconColor: Color = TierColor.get(screen.tier)
 
diff --git a/src/main/scala/ocelot/desktop/node/nodes/TapeDriveNode.scala b/src/main/scala/ocelot/desktop/node/nodes/TapeDriveNode.scala
index 92cac49..3cdce38 100644
--- a/src/main/scala/ocelot/desktop/node/nodes/TapeDriveNode.scala
+++ b/src/main/scala/ocelot/desktop/node/nodes/TapeDriveNode.scala
@@ -18,7 +18,7 @@ class TapeDriveNode(val tapeDrive: TapeDrive)
     with PositionalSoundSourcesNode
     with WindowedNode[TapeDriveWindow] {
 
-  override def iconSource: IconSource = IconSource.Nodes.TapeDrive
+  override def icon: IconSource = IconSource.Nodes.TapeDrive
 
   override def rotatable: Boolean = true
 
diff --git a/src/main/scala/ocelot/desktop/util/Spritesheet.scala b/src/main/scala/ocelot/desktop/util/Spritesheet.scala
index 4015fb3..b1cd27b 100644
--- a/src/main/scala/ocelot/desktop/util/Spritesheet.scala
+++ b/src/main/scala/ocelot/desktop/util/Spritesheet.scala
@@ -1,6 +1,6 @@
 package ocelot.desktop.util
 
-import ocelot.desktop.geometry.{Rect2D, Size2D, Vector2D}
+import ocelot.desktop.geometry.{Rect2D, Size2D}
 import ocelot.desktop.graphics.{IconSource, Texture}
 
 import javax.imageio.ImageIO
@@ -15,18 +15,18 @@ object Spritesheet extends Resource with Logging {
 
   def spriteSize(sprite: String): Size2D = sprites(sprite).size * resolution
 
-  def spriteSize(iconSource: IconSource): Size2D = iconSource.animation match {
+  def spriteSize(icon: IconSource): Size2D = icon.animation match {
     case Some(animation) =>
       animation.frameSize match {
         case Some(size) => size
 
         case None =>
-          val size = spriteSize(iconSource.path)
+          val size = spriteSize(icon.path)
 
           Size2D(size.width, size.width)
       }
 
-    case None => spriteSize(iconSource.path)
+    case None => spriteSize(icon.path)
   }
 
   def load(): Unit = {