diff --git a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png
index 7d27810c1..885ab17b1 100644
Binary files a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png and b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png differ
diff --git a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png
index 885ab17b1..7d27810c1 100644
Binary files a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png and b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png differ
diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala
index c9185db10..b96608595 100644
--- a/src/main/scala/li/cil/oc/Settings.scala
+++ b/src/main/scala/li/cil/oc/Settings.scala
@@ -199,7 +199,7 @@ object Settings {
   val screenResolutionsByTier = Array((50, 16), (80, 25), (160, 50))
   val screenDepthsByTier = Array(ColorDepth.OneBit, ColorDepth.FourBit, ColorDepth.EightBit)
   val hologramMaxScaleByTier = Array(3, 4)
-  val robotComplexityByTier = Array(16, 24, 32)
+  val robotComplexityByTier = Array(12, 24, 32)
 
   // Power conversion values. These are the same values used by Universal
   // Electricity to provide global power support.
diff --git a/src/main/scala/li/cil/oc/common/InventorySlots.scala b/src/main/scala/li/cil/oc/common/InventorySlots.scala
index 12b249af2..1829dc5c4 100644
--- a/src/main/scala/li/cil/oc/common/InventorySlots.scala
+++ b/src/main/scala/li/cil/oc/common/InventorySlots.scala
@@ -107,12 +107,12 @@ object InventorySlots {
       InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Two),
       InventorySlot(Slot.Upgrade, Tier.Two),
       InventorySlot(Slot.Upgrade, Tier.Two),
+      InventorySlot(Slot.Upgrade, Tier.One),
+      InventorySlot(Slot.Upgrade, Tier.One),
+      InventorySlot(Slot.Upgrade, Tier.One),
       InventorySlot(Slot.Card, Tier.Three),
       InventorySlot(Slot.Card, Tier.Two),
       InventorySlot(Slot.Card, Tier.Two),
@@ -173,11 +173,11 @@ object InventorySlots {
   )
 
   object Tier {
-    val None = -2
-    val Any = -1
+    val None = -1
     val One = 0
     val Two = 1
     val Three = 2
+    val Any = Int.MaxValue
   }
 
   case class InventorySlot(slot: Slot, tier: Int)
diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
index d9cc028b1..cfb8da384 100644
--- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
+++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
@@ -14,5 +14,5 @@ object UpgradeContainerFloppy extends Item with UpgradeContainer {
 
   override def providedSlot(stack: ItemStack) = Slot.Disk
 
-  override def providedTier(stack: ItemStack) = -1 // Any
+  override def providedTier(stack: ItemStack) = Int.MaxValue // Any
 }